Testing RESTful, fixed some of ORM in prev commit