Refactoring

- I would rather call this a "system test" than an "integration test"...