cleanup / refactoring
new test data
new version of interface