[ issue #38 ] Fix + Unit tests for URI normalisation