No-ticket: Added some waiting mechanisms to avoid tests to fail.