APF-1454: Improvements to allow running AMP tests in parallel.