Fix a few unit test failures that resulted from the last commit.