Move more routing tests into the routing integration test.
Authored by: edavis10 2010-04-20
Parent: [r3685]
Child: [r3687]