Oops, fixed test. Also changed to a tigher url
Merge branch 'master' into changeBookshopImageHost
Merge pull request #3572 from guardian/changeBookshopImageHost

Changed to a shorter image host url and fixed broken test