Fix a couple of unit tests