Merge pull request #10 from joncotton/master

Squash and resolve merge conflicts for "Take 2 - refactoring tests" PR #6