Up the timeout on the tests for travis.
Better name for the path parser.
Bit of caching.