Fix Test unit test bug. Fix #2533243