option refactoring, tests for associations are passing