Fix/#89 more uri bugs
The unittests will be further extended in another merge request and the other mappers will be changed in another merge request as well.
The unittests will be further extended in another merge request and the other mappers will be changed in another merge request as well.