fixing test suite to be able to work with async tests