Finishes Iteration H2

Adds integration test