Refactored tests
Merge pull request #1 from ericyliu/refactor-tests

Refactored tests