uripattern class - harder than you think. Fixed some tests