Fix UTs (missing waitTask and sleep)