tidied up href resolution
added more uri resolition tests