Fix the test cleanup issue
Merge pull request #52 from hyonholee/dev

Fix the test cleanup issue