Monkey-patched failing routing tests (partially)

thx, to @ffeldhaus and @seanwalbran

See https://gist.github.com/seanwalbran/4643140