Tidying integration test, adding whole package instead of separate classes
Refactoring/renaming a number of concepts