Add missing changes for integration test