Added prelim eval and more tests.