Fix all but one test, uri-template seems to be working out quite well, need another test for args though