fixed parsing according to changes in parser API
changed scheme and location type to URI
parser tests rewrite