Controller is now Async and unit tests all pass