working through refactoring the new test suite.