Issue #91: internal restructuring and support for rerunning different test result sets