Merged latest fix for test framework revamp into development