Clean up tests per @asutherland