Fixing integration tests due to recent modifications