fix to a few failing tests