Test reorg. Refactored existing tests to call newly-defined runTest. All tests now output.