Begin the test case refactoring (issue #11).