diff --git a/mozilla/embedding/qa/testembed/BrowserImpl.cpp b/mozilla/embedding/qa/testembed/BrowserImpl.cpp
index 97da9f26c68..7a0bbc2a1f6 100644
--- a/mozilla/embedding/qa/testembed/BrowserImpl.cpp
+++ b/mozilla/embedding/qa/testembed/BrowserImpl.cpp
@@ -529,7 +529,8 @@ NS_IMETHODIMP CBrowserImpl::OnStartURIOpen(nsIURI *aURI, PRBool *_retval)
 	QAOutput("nsIURIContentListener->OnStartURIOpen()",1);
 
 	GetTheUri(aURI, 1);
-	*_retval = PR_TRUE;
+	// set return boolean to false so uriOpen doesn't abort
+	*_retval = PR_FALSE;
 	FormatAndPrintOutput("_retval set to = ", *_retval, 1);
 
 	return NS_OK;
diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp
index 7312ff38d97..998d8f2b53a 100644
--- a/mozilla/embedding/qa/testembed/Tests.cpp
+++ b/mozilla/embedding/qa/testembed/Tests.cpp
@@ -519,6 +519,7 @@ void CTests::OnTestsAddUriContentListenerByUriLoader()
 
 void CTests::OnTestsAddUriContentListenerByOpenUri()
 {
+	CUrlDialog myDialog;
 	nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
 	RvTestResult(rv, "nsIURILoader() object test", 1);
 	if (!myLoader) {
@@ -527,8 +528,15 @@ void CTests::OnTestsAddUriContentListenerByOpenUri()
 	}
 	nsCOMPtr<nsIChannel> theChannel;
 	nsCOMPtr<nsIURI> theURI;
-	NS_NewURI(getter_AddRefs(theURI), "http://www.yahoo.com");
-	NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
+	if (myDialog.DoModal() == IDOK)
+	{
+		NS_NewURI(getter_AddRefs(theURI), myDialog.m_urlfield);
+		NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
+	}
+	else {
+		QAOutput("Didn't get a url. test failed", 2);
+		return;
+	}
 	nsCOMPtr<nsISupports> mySupports = do_QueryInterface(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl));
 	rv = myLoader->OpenURI(theChannel, PR_TRUE, mySupports);
 	RvTestResult(rv, "nsIUriLoader->OpenURI() test", 2);
diff --git a/mozilla/embedding/qa/testembed/nsICmdParams.cpp b/mozilla/embedding/qa/testembed/nsICmdParams.cpp
index 6ee603f0549..d42e6538c68 100644
--- a/mozilla/embedding/qa/testembed/nsICmdParams.cpp
+++ b/mozilla/embedding/qa/testembed/nsICmdParams.cpp
@@ -303,8 +303,8 @@ void CnsICmdParams::RunAllTests()
 	else
 	    QAOutput("We didn't get nsICommandParams object.", 2);
 
-	SetBooleanValueTest(PR_TRUE, "state_attribute");
 	SetBooleanValueTest(PR_FALSE, "state_attribute");
+	SetBooleanValueTest(PR_TRUE, "state_attribute");
 	SetLongValueTest(15000000, "state_attribute");
 	SetDoubleValueTest(100.295375, "state_attribute");
 	SetStringValueTest("Hello world!", "state_attribute");
diff --git a/mozilla/embedding/qa/testembed/nsICommandMgr.cpp b/mozilla/embedding/qa/testembed/nsICommandMgr.cpp
index 6f168e772a6..c4a81838a06 100644
--- a/mozilla/embedding/qa/testembed/nsICommandMgr.cpp
+++ b/mozilla/embedding/qa/testembed/nsICommandMgr.cpp
@@ -71,7 +71,7 @@ CnsICommandMgr::~CnsICommandMgr()
 {
 }
 
-
+// 1st column: command; 2nd column: DoCommand state; 
 CommandTest CommandTable[] = {
 	{"cmd_bold", "", "state_all", "state_begin", "state_end", "state_mixed", 1},
 	{"cmd_italic", "", "state_all", "state_begin", "state_end", "state_mixed", 1},
@@ -199,7 +199,8 @@ void CnsICommandMgr::GetCommandStateTest(const char *aCommandName)
 	}
 }
 
-void CnsICommandMgr::DoCommandTest(const char *aCommandName)
+void CnsICommandMgr::DoCommandTest(const char *aCommandName,
+								   const char *doCommandState)
 {
 	nsCAutoString value;
 
@@ -214,10 +215,8 @@ void CnsICommandMgr::DoCommandTest(const char *aCommandName)
         QAOutput("Didn't get nsICommandParam object. Test fail");
 		return;
 	}
-	if  (strcmp(aCommandName,"cmd_fontColor") == 0 ||
-		 strcmp(aCommandName,"cmd_backgroundColor") == 0 ||
-		 strcmp(aCommandName,"cmd_fontFace") == 0 ||
-		 strcmp(aCommandName,"cmd_align") == 0)
+
+	if (strcmp(doCommandState, "state_attribute") == 0)
 	{
 		if (strcmp(aCommandName,"cmd_fontColor") == 0 ||
 		    strcmp(aCommandName,"cmd_backgroundColor") == 0)
@@ -256,7 +255,7 @@ void CnsICommandMgr::OnStartTests(UINT nMenuID)
 			GetCommandStateTest("cmd_charSet");
 			break;
 		case ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND :
-			DoCommandTest("cmd_fontColor");
+			DoCommandTest("cmd_fontColor", "state_attribute");
 			break;
 	}
 }
@@ -271,7 +270,8 @@ void CnsICommandMgr::RunAllTests()
 		IsCommandSupportedTest(CommandTable[i].mCmdName);
 		IsCommandEnabledTest(CommandTable[i].mCmdName);
 		GetCommandStateTest(CommandTable[i].mCmdName);
-		DoCommandTest(CommandTable[i].mCmdName);
+		DoCommandTest(CommandTable[i].mCmdName,
+					  CommandTable[i].mDoCmdParam);
 	}
 }
 
diff --git a/mozilla/embedding/qa/testembed/nsICommandMgr.h b/mozilla/embedding/qa/testembed/nsICommandMgr.h
index 64277c0d9d9..3ea40d90c71 100644
--- a/mozilla/embedding/qa/testembed/nsICommandMgr.h
+++ b/mozilla/embedding/qa/testembed/nsICommandMgr.h
@@ -74,7 +74,7 @@ public:
 	void IsCommandSupportedTest(const char *);
 	void IsCommandEnabledTest(const char *);
 	void GetCommandStateTest(const char *);
-	void DoCommandTest(const char *);
+	void DoCommandTest(const char *, const char *);
 	void OnStartTests(UINT nMenuID);
 	void RunAllTests();
 // Operations
diff --git a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp
index a14a2fc9d39..0ef5a86b1b2 100644
--- a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp
+++ b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp
@@ -157,11 +157,11 @@ winEmbedFileLocProvider::GetFile(const char *prop, PRBool *persistant, nsIFile *
     // Please see http://www.mozilla.org/projects/embedding/MRE.html
     // for more info. on GRE
     //---------------------------------------------------------------
-    else if (nsCRT::strcmp(prop, NS_GRE_DIR) == 0)
+    else if (nsCRT::strcmp(prop, NS_MRE_DIR) == 0)
     {
         rv = GetGreDirectory(getter_AddRefs(localFile));
     }    
-    else if (nsCRT::strcmp(prop, NS_GRE_COMPONENT_DIR) == 0)
+    else if (nsCRT::strcmp(prop, NS_MRE_COMPONENT_DIR) == 0)
     {
         rv = GetGreDirectory(getter_AddRefs(localFile));
         if (NS_SUCCEEDED(rv))
@@ -236,7 +236,7 @@ NS_METHOD winEmbedFileLocProvider::GetGreDirectory(nsILocalFile **aLocalFile)
     // Get the path of the GRE which is compatible with our embedding application
     // from the registry
     //
-    char *pGreDir = GetMreLocationFromRegistry();
+    char *pGreDir = GetGreLocationFromRegistry();
     if(pGreDir)
     {
         nsCOMPtr<nsILocalFile> tempLocal;