As the work of this migration did take quite some time, some changes where
made in master after this branch was started. These are ported to the new
test file.
The old test_eval.in file did a `:wq` on line 168. The following 60 lines
where not used and there was no expected output for them in test_eval.ok.
This test code is now used in several test cases in the new test file.
