Added some domain classes with some tests