Changed my classes and did domain class tests
Merge origin/master