Looks like I missed one case.

The tests now pass as expected.