(Beccie) Minor refactoring of test classes
Merge branch 'master' of https://github.com/spwntr/rnr2
merge commit