fix import and add 6 cases
Merge pull request #9 from huangnoah/new-20130320

fix import and add 6 cases