Finish association tests
Merge branch 'association-tests'