refactoring domain testpackage