Restore TestSqlCmdErrorHandling diagnostics and longer timeouts