simplified domain names
refactored test data set up
test name fix
test refactoring and cleanup
fixed mistype in test name