Copy, improved tests