timeouts removed or replaced with more suitable code
refactored
unused import removed
hardcoded timeouts removed or replaced (tests with varying behaviour)
Merge pull request #299 from pisaychuk/sleeps

Hard-coded timeouts removed or replaced