Fix unittest error imported from master