Think of better way to test instead of using thread sleep

[nbozic-zz]

We are using thread sleep in tests extensively. We should think about better way of doing this threads.