Changes to 'test-timeout'