Fix a bunch more unit test issues.