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

Move some test helpers to the framework