A few testing_framework branch fixes