Fixing more integration tests