INT-3171: Polishing Aggregator tests

* Increase waiting timeouts
* Get rid of `Thread.sleep` when it's dangerous

JIRA: https://jira.springsource.org/browse/INT-3171