start of test suite refactor to make test setup and execution more explicit