Testing improvements
Merge pull request #141 from GrahamCampbell/testing

Testing Improvements