reduce EM tol, and test fixes