Merge "Increase unit test coverage for v2 images client"