Fix additional test failures
Fix additional test failures

data-exp-lab/girder,manthey/girder,manthey/girder,kotfic/girder,manthey/girder,RafaelPalomar/girder,data-exp-lab/girder,Kitware/girder,jbeezley/girder,Kitware/girder,Kitware/girder,jbeezley/girder,jbeezley/girder,Xarthisius/girder,data-exp-lab/girder,jbeezley/girder,RafaelPalomar/girder,kotfic/girder,girder/girder,Xarthisius/girder,data-exp-lab/girder,girder/girder,kotfic/girder,data-exp-lab/girder,Xarthisius/girder,RafaelPalomar/girder,RafaelPalomar/girder,girder/girder,kotfic/girder,Xarthisius/girder,manthey/girder,girder/girder,RafaelPalomar/girder,Xarthisius/girder,kotfic/girder,Kitware/girder