some changes for integration tests