Improvements for preparation to separate test data into plain text files.

Refs #103.
Merge remote-tracking branch 'origin/master' into testtsv2
Trim dependencies. Refs #103.
Merge pull request #114 from ceefour/testtsv2

Improvements for preparation to separate test data into plain text files