Integration tests fixes