use correct timeout handling for tests