cleaned up the test sooooo much, but haven't tried it yet
Merge pull request #1 from micahflee/master

cleaned up the test sooooo much, but haven't tried it yet