Begin test case refactor.
Finish test case fixup.