Merge pull request #9766 from davidhorstmann-arm/move-some-test-helpers-to-framework-3.6

[Backport 3.6] Move some test helpers to the framework