Tweaked test timeouts