refactored ORM spec and passing code