Rewrite sEval; fix tests for corrected sEval.