Refactor ORM test case to include validator