Fixing some test failures caused by updating to current Jenkins dev builds.