chasing down some extra test coverage and making some tidy-ups at the same time
Merge pull request #49 from JamesCohen-awin/test-coverage

Test tidying and increased coverage