Refactored test to be a little more reasonable.
Merge pull request #18 from arb/test-cleanup-part1

Refactored test to be a little more readable