Fix up failing tests
Fix up failing tests

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