All previously commented-out tests (other than many-to-many) pass