Testing improvements
Merge pull request #313 from GrahamCampbell/2.1-tests

Testing Improvements