util: expand2vector handles another case, plus add unit test