diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 8c76464..71d2034 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -268,7 +268,7 @@ static const detailed_info_t detailed_info2 = {
     work_dir,
 };
 
-static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo)
+static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, BOOL todo)
 {
     ACTIVATION_CONTEXT_DETAILED_INFORMATION detailed_info_tmp, *detailed_info;
     SIZE_T size, exsize, retsize;
@@ -327,8 +327,11 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo)
     if(exinfo->root_manifest_path) {
         ok(detailed_info->lpRootManifestPath != NULL, "detailed_info->lpRootManifestPath == NULL\n");
         if(detailed_info->lpRootManifestPath)
+        {
+            if (todo) todo_wine
             ok(!lstrcmpiW(detailed_info->lpRootManifestPath, exinfo->root_manifest_path),
                "unexpected detailed_info->lpRootManifestPath\n");
+        }
     }else {
         ok(detailed_info->lpRootManifestPath == NULL, "detailed_info->lpRootManifestPath != NULL\n");
     }
@@ -337,8 +340,11 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo)
     if(exinfo->app_dir) {
         ok(detailed_info->lpAppDirPath != NULL, "detailed_info->lpAppDirPath == NULL\n");
         if(detailed_info->lpAppDirPath)
+        {
+            if (todo) todo_wine
             ok(!lstrcmpiW(exinfo->app_dir, detailed_info->lpAppDirPath),
                "unexpected detailed_info->lpAppDirPath\n%s\n",strw(detailed_info->lpAppDirPath));
+        }
     }else {
         ok(detailed_info->lpAppDirPath == NULL, "detailed_info->lpAppDirPath != NULL\n");
     }
@@ -408,7 +414,7 @@ static const info_in_assembly manifest_comctrl_info = {
     0, NULL, NULL, TRUE /* These values may differ between Windows installations */
 };
 
-static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembly *exinfo)
+static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembly *exinfo, BOOL todo)
 {
     ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info, info_tmp;
     SIZE_T size, exsize;
@@ -504,8 +510,11 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl
     if(exinfo->manifest_path) {
         ok(info->lpAssemblyManifestPath != NULL, "info->lpAssemblyManifestPath == NULL\n");
         if(info->lpAssemblyManifestPath)
+        {
+            if (todo) todo_wine
             ok(!lstrcmpiW(info->lpAssemblyManifestPath, exinfo->manifest_path),
                "unexpected info->lpAssemblyManifestPath\n");
+        }
     }else {
         ok(info->lpAssemblyManifestPath != NULL, "info->lpAssemblyManifestPath == NULL\n");
     }
@@ -865,7 +874,7 @@ static void test_actctx(void)
     ok(handle == NULL, "handle = %p, expected NULL\n", handle);
     ok(b, "GetCurrentActCtx failed: %u\n", GetLastError());
     if(b) {
-        test_detailed_info(handle, &detailed_info0);
+        test_detailed_info(handle, &detailed_info0, FALSE);
         pReleaseActCtx(handle);
     }
 
@@ -879,8 +888,8 @@ static void test_actctx(void)
     handle = test_create("test1.manifest", manifest1);
     DeleteFileA("test1.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info1);
-        test_info_in_assembly(handle, 1, &manifest1_info);
+        test_detailed_info(handle, &detailed_info1, FALSE);
+        test_info_in_assembly(handle, 1, &manifest1_info, FALSE);
 
         if (pIsDebuggerPresent && !pIsDebuggerPresent())
         {
@@ -904,9 +913,9 @@ static void test_actctx(void)
     DeleteFileA("test2.manifest");
     DeleteFileA("testdep.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info2);
-        test_info_in_assembly(handle, 1, &manifest2_info);
-        test_info_in_assembly(handle, 2, &depmanifest1_info);
+        test_detailed_info(handle, &detailed_info2, FALSE);
+        test_info_in_assembly(handle, 1, &manifest2_info, FALSE);
+        test_info_in_assembly(handle, 2, &depmanifest1_info, FALSE);
         pReleaseActCtx(handle);
     }
 
@@ -921,9 +930,9 @@ static void test_actctx(void)
     DeleteFileA("test3.manifest");
     DeleteFileA("testdep.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info2);
-        test_info_in_assembly(handle, 1, &manifest2_info);
-        test_info_in_assembly(handle, 2, &depmanifest2_info);
+        test_detailed_info(handle, &detailed_info2, FALSE);
+        test_info_in_assembly(handle, 1, &manifest2_info, FALSE);
+        test_info_in_assembly(handle, 2, &depmanifest2_info, FALSE);
         test_file_info(handle, 1, 0, testlib_dll);
         test_file_info(handle, 1, 1, testlib2_dll);
 
@@ -948,9 +957,9 @@ static void test_actctx(void)
     DeleteFileA("test2-3.manifest");
     DeleteFileA("testdep.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info2);
-        test_info_in_assembly(handle, 1, &manifest2_info);
-        test_info_in_assembly(handle, 2, &depmanifest3_info);
+        test_detailed_info(handle, &detailed_info2, FALSE);
+        test_info_in_assembly(handle, 1, &manifest2_info, FALSE);
+        test_info_in_assembly(handle, 2, &depmanifest3_info, FALSE);
         test_file_info(handle, 1, 0, testlib_dll);
         test_file_info(handle, 1, 1, testlib2_dll);
 
@@ -976,8 +985,8 @@ static void test_actctx(void)
     handle = test_create("test3.manifest", manifest3);
     DeleteFileA("test3.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info1);
-        test_info_in_assembly(handle, 1, &manifest3_info);
+        test_detailed_info(handle, &detailed_info1, FALSE);
+        test_info_in_assembly(handle, 1, &manifest3_info, FALSE);
         test_file_info(handle, 0, 0, testlib_dll);
 
         b = pActivateActCtx(handle, &cookie);
@@ -1002,9 +1011,9 @@ static void test_actctx(void)
     DeleteFileA("test4.manifest");
     DeleteFileA("testdep.manifest");
     if(handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info2);
-        test_info_in_assembly(handle, 1, &manifest4_info);
-        test_info_in_assembly(handle, 2, &manifest_comctrl_info);
+        test_detailed_info(handle, &detailed_info2, FALSE);
+        test_info_in_assembly(handle, 1, &manifest4_info, FALSE);
+        test_info_in_assembly(handle, 2, &manifest_comctrl_info, FALSE);
         pReleaseActCtx(handle);
     }
 
@@ -1020,8 +1029,8 @@ static void test_actctx(void)
         handle = test_create("..\\test1.manifest", manifest1);
         DeleteFileA("..\\test1.manifest");
         if(handle != INVALID_HANDLE_VALUE) {
-            test_detailed_info(handle, &detailed_info1);
-            test_info_in_assembly(handle, 1, &manifest1_info);
+            test_detailed_info(handle, &detailed_info1, FALSE);
+            test_info_in_assembly(handle, 1, &manifest1_info, FALSE);
             pReleaseActCtx(handle);
         }
         SetCurrentDirectoryW(work_dir);
@@ -1039,8 +1048,8 @@ static void test_actctx(void)
     handle = test_create("test1.manifest", manifest1);
     DeleteFileA("test1.manifest");
     if (handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info1);
-        test_info_in_assembly(handle, 1, &manifest1_info);
+        test_detailed_info(handle, &detailed_info1, FALSE);
+        test_info_in_assembly(handle, 1, &manifest1_info, FALSE);
         pReleaseActCtx(handle);
     }
 
@@ -1053,8 +1062,8 @@ static void test_actctx(void)
     handle = test_create("test1.manifest", manifest1);
     DeleteFileA("test1.manifest");
     if (handle != INVALID_HANDLE_VALUE) {
-        test_detailed_info(handle, &detailed_info1);
-        test_info_in_assembly(handle, 1, &manifest1_info);
+        test_detailed_info(handle, &detailed_info1, FALSE);
+        test_info_in_assembly(handle, 1, &manifest1_info, FALSE);
         pReleaseActCtx(handle);
     }
 
@@ -1071,8 +1080,8 @@ static void test_app_manifest(void)
     ok(handle == NULL, "handle != NULL\n");
     ok(b, "GetCurrentActCtx failed: %u\n", GetLastError());
     if(b) {
-        test_detailed_info(handle, &detailed_info1_child);
-        test_info_in_assembly(handle, 1, &manifest1_child_info);
+        test_detailed_info(handle, &detailed_info1_child, TRUE);
+        test_info_in_assembly(handle, 1, &manifest1_child_info, TRUE);
         pReleaseActCtx(handle);
     }
 }
@@ -1115,6 +1124,7 @@ static void init_paths(void)
     GetModuleFileNameW(NULL, exe_path, sizeof(exe_path)/sizeof(WCHAR));
     lstrcpyW(app_dir, exe_path);
     for(ptr=app_dir+lstrlenW(app_dir); *ptr != '\\' && *ptr != '/'; ptr--);
+    ptr[0] = '/';
     ptr[1] = 0;
 
     GetCurrentDirectoryW(MAX_PATH, work_dir);
@@ -1125,6 +1135,8 @@ static void init_paths(void)
     lstrcatW(work_dir_subdir, subdir);
 
     GetModuleFileNameW(NULL, app_manifest_path, sizeof(app_manifest_path)/sizeof(WCHAR));
+    for(ptr=app_manifest_path+lstrlenW(app_manifest_path); *ptr != '\\' && *ptr != '/'; ptr--);
+    ptr[0] = '/';
     lstrcpyW(app_manifest_path+lstrlenW(app_manifest_path), dot_manifest);
 }
 
-- 
1.5.4.3