Switched to the new file format; all tests passing, but still a lot of work to make the old file formats work