Fixed setup/teardown logic, working on TestResult structures