Testing improvements
Merge pull request #342 from GrahamCampbell/3.2-testing

[3.2] Testing Improvements