integration tests improvements