refactored tests to reflect Cloudbees slowness