Fix files to copy

I fixed bug #633, but I could not figure out how to get the unit tests working. Can anyone help with that so I can update the tests and push it in this very pull request?