replace expectations that cause deprecation warnings, replace .should base expectations with expect() syntax