More unit tests and longer timeouts for travis-ci