Refactor and added Moch Async testing