all_tests.py is overriding the default with 240 seconds (I didn't change this). The previous default was 60. Let's just leave as-is?