Remove redundant mocks; merge router tests.