Thread: Try to fix some checks that fails depending on the way the threads are switched (the time constraint is too high)