Fix a few unit tests