Fix and refactor a convoluted test (#2921)
Fix and refactor a convoluted test (#2921)

Everything after an `and` was never run because `None and anything` short-circuits to `None`.
And if it *did* run, it would've failed
mkdocs/mkdocs,mkdocs/mkdocs,mkdocs/mkdocs