Fix tests in light of copy changes