Fixing up the tests for Jenkins.