Fix associations so the tests pass