Corrections to EOMF test BMM schemas