EA_MODEL Fixed tests that had stopped working due to changes