Merged changes from "Assoc update cleanup and added testcases" PR

Hi @junmendoza, please help to take a look. Thanks!