More compile-time switches; new tests and data analysis; cleaned up testHarness.C for benchmarking