Revert "AmfTest fix"

This reverts commit e059d8c62c29abdbf76245c7b095b3d28e4a07ed.