clarify urls in tests
sort out the url template passing mess