Adjusted ImageHelperTest and BitmapLoaderTest in light of splitting out bitmpa creation, and bitmap file creation, in to BitmapMocker and BitmapFileMocker