Change "should" syntax to "expect" style

This just changes the "shoulds" that raise deprecation warnings.