Added some timeouts to make Travis tests work