Rework rest of the test to FES 2.0

Fix accidental dual header

Fix accidental dual header

Fix accidental dual header

Fix accidental dual header

Fix accidental dual header

Fix accidental dual header

Switch to copy() NIO Files.copy()

Remove auto-generated TODO