Can you split this into two tests?  One for the `None` case and one for the non-`None` case?