Remove factor of 10 by default.  

Puts behavioural tests time-out at 60 seconds, and functional tests at 600 seconds.