Reduce static waiting time in tests

[aalmiray]

Issue Description

Type: feature request

Describe what happened (or what feature you want)

There are some tests that take a fixed amount of time waiting for a condition to become true (using Thread.sleep() and/or TimeUnit.sleep(). This means tests will always wait for such periods, making a build slower.

Describe what you expected to happen

Configurable waiting conditions via https://github.com/awaitility/awaitility as explained at https://github.com/awaitility/awaitility/wiki/Usage

[sczyh30]

Hi, thanks for your suggestion. We'll improve the test with it :)