Merge pull request #8689 from paul-elliott-arm/make_tests_thread_safe

Make test data thread safe