Testing improvements
Merge pull request #4 from GrahamCampbell/testing

Testing Improvements