Test improvements
Merge pull request #327 from GrahamCampbell/2.1-tests

[2.1] More Testing Improvements