Cleaned up test harness a bit