APF-1454: Fixes for failing tests when running AMP.