Minor adjustments to the timeout so travis succeeds