Clean up and simplify test case.