Updated ORM spec and passing code for all tests