Merge pull request #9787 from ronald-cron-arm/move-back-test-configs

Move back test configs