refactored to remove route-adapter from deps / added tests