Use 30s timeout in waitfor function in case things happen slower than th...

...ey should