Merge "Improved tests in tempest.api.image.v2.*"