BS-9986, rewrite the test in order to use an active waiting