Fix bug with numeric keys in URL generator

There was an ampersand missing in the implode of numeric keyed parameters, so they wouldn't be joined correctly. I also updated the tests to better reflect the possibilities of the url generator now.

See first commit for actual changes, the indentation update in the second commit makes it hard to spot the differences otherwise.