changes to fix tests related to HTTPErrors