Moved to std::unique_ptr<> and async tests