Better setup and teardown of test.