Fix test expectations. All passing again.