Fixed path parser.
Added tests