Add association tests.
Refactor test folder