Convert more shoulds to expects.