integration tests fixed