Minor automatic changes
EA_MODEL Test fixes