FuncTest Cleanup