Fix unittest failure caused by 1d7da6f