Fix #204

The good pull request to fix the issue #204 related to uritemplate.
The unit-tests are updated according to this however 4 of them are still failing (not related to uritemplate).