Re-greened tests
Merge pull request #21 from ysjwang/tests/refactor

Re-greened tests