Rewrite expectations to use 'should'