Add test_eval_atom(). Clean up the other test cases