Minor test case cleanup

6 files changed