Fix ORM test suite