[BUG #8414] updated tests
increased timeout to improve stability for slow clients