Added async method and test