Test fixes

I broke the Jenkins tests with my PR from yesterday...here are my fixes.