Refactored the test suite.
Merge pull request #14 from ajdawson/refactor-tests

Refactored the test suite.