Change where the original copy is done and add a test for this.