Fix up some tests:
- unlink copied files because they confused File_Structure_Test
- update golden files