Fix #11

The unit-tests are changed according but 4 are still failing (not related to uritemplate).