Improvements for preparation to separate test data into plain text files

Refs #103.