Testing improvements
Fixed config
Merge pull request #164 from GrahamCampbell/testing

Testing Improvements