Merge pull request #18686 from bebef1987/gallery

Bug 1000062 - Delete some more redundant tests