Address Tobias' comments. Adjust test timeout for travis.