Merge "Revive ForwardDeleteTest with updating expectations"