Refactor the tests to have less redundancy
Merge pull request #11 from tbranyen/refactor-tests

Refactor the tests to have less redundancy