Adjust the tests to handle the new asynchronous situation of the tests being testling friendly