Refactor to introduce testEnvironment tests and testSuite.