Add more test cases, delete section, fix #8 and fix #9