Merge reader testfiles into shared testfile dir

Finishes the migration to all test fixture files being in a shared directory.
Some of the manifest naming is a little lazy (the alternative being verbosity
until something better can be worked out).