Fix a few failing tests