Resolved some integration test issues