Added catch for urls that return non-images and corresponding tests
Modified to allow override of http content type