GPII-20: Cleaner loading of testframework