Restructured tests on eval.