Some changes to RME and AME tests