Increase test timeout from 15s->30s

Building on machines with slow disks makes this fail sometimes due to cumulative test time taking >15.000s.  Bumping to 30s.