Added ORM base class; Added tests