Fixing some EME tests