Begin refactoring of tests.
More test case refactoring.