[#46898331] Missed removing some Nones from tests