Cleaned up some of the test methods to make tests more readable.
Merge pull request #9 from staritza/master

Cleaned up some of the test methods to make tests more readable.