Turns out URI.join doesn't like queries :P

Made the relative->absolute change more robust and handled queries, made test non-ambiguous

Signed-off-by: Naomi Novik <shalott@gmail.com>