Remove duplicate road links from test data and fix tests that were broke...

...n.