Changing test timeout from 15 to 30

TBR: @devoncarew