Expectations: use expect instead of deprecated should