Fixing some integration test issues