Fix some TCs + improved timing issue:
* COndition instead of sleep