More fixes to expected data.