test data
general refactoring