Testcase cleanup/fixes