PARTIAL: Begin re-enabling gallery tests
PARTIAL: Minor adjustments to mock