test_whole_cases is running now

I have made some changes to router to let it work.