Factor out setup tool
More tests
Merge pull request #28 from steventlamb/topic/increase_test_coverage

Topic/increase test coverage