Make cleanup test use async waterfall