Updated tests

..to reflect copy changes