Changed expected error messages for 2.1