APF-1391 Fix for AMP tests.