Removed non-async methods and refactored test cases.