fix a few failing tests