Removed unit testing until a problem with orchestra/testbench is fixed
Better path parsing