Fixed associations so all specs are passing