finish router spec migration