Update old tests and add new test for evaluation order