Improving test coverage
Removed async utils which added very little value