Working a bit more on tests for the ORM