Merge "Remove duplicate image tests for tenant authZ"