fixed the test failures on Jenkins.