Modify tests to reflect copy changes