Refactoring test
Added domain objects