Adding more tests, working on the test harness.