Refactor the wait methods to not get the task automatically (less transactions, test more fast)