Andrew's fix for test_2 evaluation. Works great!