Changed source code follow comments. So I have to delete some test case and change some configure on layout.