Changed domain entity and tests
#dox-15 Fixed