Fix Integration tests