Merge pull request #243 from wasamasa/assoc-update-tests