Improved ImageProviderTest