Fix a few more unit tests.