more tests, remove dead code in URI template