Refactor Tests
Merge pull request #28 from thejameskyle/refactor-tests

Refactor tests