Taken out mw dependency, added async dependency to tests