Added some domain classes and unit tests