Forgot to accommodate nesting operations

Expanded timeouts in G1/G2 wait conditions.