refactor and temporary fix test cases
Merge branch 'master' of https://github.com/stupidsing/suite