Fix test error.
Merge branch 'FIX_TEST'