change 5 seconds wait on future to infinite wait on future and 30 seconds test timeout. fixes #3739