Use doubles instead of deprecated stubs