Minor cleanups and fix Eval tests to work correctly.