Merge pull request #63 from inetic/routing_v2

Enabled some tests
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2