oops, fix a few failing tests