Fixing Integration test issues