Test infrastructure improvements, allow for integration tests.
Merge pull request #24 from leftclickben/master

Test infrastructure improvements, allow for integration tests.