made setup and teardown logic more coherent. next step: applying it all of the test suites.