Fix a few failing unit tests