Multiple runTest refactorings. Filled in some more tests. All tests pass.