Adding cleanup for all test runner calls

A couple of changes in order for clean-up calls & tests to work correctly