New version including spy for async testing