small improvements and refactorings
preparing for integration test
first integration test