Making unit tests pass
Preparations for integration tests