Add UT and missing close event