minor refactoring and changing of test data