more stringent S-EM conditions
test fixes