Feature/252

Fixes related to 252 getting setup on the new cloudbees account.  Before I touched this, most tests failed.