Refactoring some more tests.
Merge pull request #11 from andrewhao/more-tests

Refactoring some more tests.