cleaned up tests
further cleanup of test harness