Clean out cruft from testing framework
Merge branch 'fix/tests' into develop