Adding missing import statements after the merge from maint/3.3/testing to testing