Refactoring more tests to use assertEvalsTo.