Clean up and fix test
Merge pull request #1 from joshfng/master

Clean up and fix test