Merge "resourceloader: Convert ImageModule test to stricter unit test"