LPS-45866 Update to the new test framework