Refactored some tests to be awaitable and await SUT returns.