Update expected values for Andy's tests