Test Harness Beef Up