Fix unit tests to account for the changes in commit 1e2dbd39c8b4197e0352d2c7507a0c80cd8d3e3c