improve package and make
tests based on uritemplate-test