Fix conflicted copy integration tests