EA_MODEL Fixes due to tests failing