(#2347) Instances of lambda { }.should are better expressed as expect { }.to

Following comments in pull request #1924