Refactoring: adding test domains