Integration tests fixed