Several test fixes, mostly for timing issues. These have resolved build issues in cloudbees.