reverting to old timeouts (make testcases faster instead), but keeping variables to set them