PARTIAL: Begin fixing Gallery tests...