WIP test case cleanup