Merge "Revert "Add test config to init_tests""