OO Design principles on domain
OO Design principles on domain test files
Merge origin/master