2 classes removed, FeedDelayParallelTimeoutTest refactored