fix router, models and mocks after meeting