included test and fixed uri decoding