Testing improvements
Merge pull request #343 from GrahamCampbell/testing

[4.0] Testing Improvements