Updated test harness

Test harness can call setup code multiple times before test