Fixed a few failing tests