also expand the unit test a bit to ensure this doesn't break anything (cherry picked from commit af7fc5bd)