Fixed ORM tests