I've confirmed the patch attached fixed the issue, but I wasn't able to have time to finish the unit test mocking.
I've confirmed the patch attached fixed the issue, but I wasn't able to have time to finish the unit test mocking.