What I've got now.
Merge pull request #7 from andrewhao/tests

What I've got now.