Clears up the configuration somewhat!!
Fixed broken tests from addition of "-@repo" to Jenkins URL's