Might fix uri issues. Also supports proper parameter encoding
Update tests