FAIMS-814 Revert alert types, fix tests