add new changes for integration tests