Enhance test suite

Primarily focused on making the reading and writing of tests simpler.  Also happens to improve test coverage by including an unused test.