Integration test failures fixed