extended test timeouts, updated scripts to handle test timeout