Fixing tests and path parsing