Minor testcase cleanup