Updated Test Harness