Merge "clean the unittest2."