refactor test, reduce code
Merge pull request #60 from holys/develop

refactor test, reduce code