Merge "Re-add tests using java.nio.file.Files"