Update to comply with latest 3.9 Scout testing support