Refactor the tests - remove copy()