Fix most evaluation specs
Finish fixing new_evaluation specs