Improved test config
Merge pull request #91 from SammyK/better-test-setup

Improved test setup & config