Fixed few failing tests