Fix test
Merge branch 'copy-from'