Fixed association issues. 2 tests still pending.