#10 integration tests fixed