cleaned up the Eval tests a bunch.