Improve copy tests