Unreviewed gardening. Re-skip some obsolete EME tests.