Some QA scenarios often timeout

As seen here, there are scenarios that often timeouts. We should look at improving them.