Small fixes to merge/assoc, more comprehensive assoc tests