Rewrite tests to use unique file names for output files
New key names

These changes were made to make it easier to understand what was going on
when explaining the file format.

This closes #19.