integration tests bug fixed