Add further tests. Remove routing tests.