Testing improvements
Merge pull request #70 from GrahamCampbell/testing

Testing Improvements