Test Improvement

NeutroniumCore · Feb 13, 2017 · 14e678d · 14e678d
1 parent c5854a4
commit 14e678d
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 105 deletions.
diff --git a/Neutronium.sln b/Neutronium.sln
@@ -390,8 +390,8 @@ Global
 		{AF41D637-D053-4FDE-9D8A-96106CCBD19E}.Release|x86.Build.0 = Release|x86
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|x64.Build.0 = Debug|Any CPU
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Debug|x86.ActiveCfg = Debug|x86
@@ -406,8 +406,8 @@ Global
 		{B58A7D48-F3E7-47D5-80C1-0A905612EC6F}.Release|x86.Build.0 = Release|x86
 		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E31DE95-4FBE-4D91-93CD-5CA14F6FD0FB}.Debug|x86.ActiveCfg = Debug|x86
@@ -678,8 +678,8 @@ Global
 		{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x86.Build.0 = Release|x86
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.Build.0 = Debug|Any CPU
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x86.ActiveCfg = Debug|x86
@@ -694,8 +694,8 @@ Global
 		{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x86.Build.0 = Release|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.Build.0 = Debug|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x86.ActiveCfg = Debug|x86
@@ -710,8 +710,8 @@ Global
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x86.Build.0 = Release|x86
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|x86.ActiveCfg = Debug|x86
@@ -726,8 +726,8 @@ Global
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Release|x86.Build.0 = Release|x86
 		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|x64.Build.0 = Debug|Any CPU
 		{440A6F09-63E4-4BDA-BEF4-BEAF02A8EE30}.Debug|x86.ActiveCfg = Debug|x86
@@ -758,8 +758,8 @@ Global
 		{A82D4195-0F75-48B3-8E43-5BE90D061C6C}.Release|x86.Build.0 = Release|x86
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|x64.Build.0 = Debug|Any CPU
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Debug|x86.ActiveCfg = Debug|x86
@@ -774,8 +774,8 @@ Global
 		{E489B2FD-DD99-4276-BD33-51099ACA0970}.Release|x86.Build.0 = Release|x86
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Debug|x86.ActiveCfg = Debug|x86
@@ -790,8 +790,8 @@ Global
 		{BA9E21FA-3267-4B69-BB72-ABA196F715B4}.Release|x86.Build.0 = Release|x86
 		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2001FC2C-5166-4828-A47D-AB6D455A634B}.Debug|x86.ActiveCfg = Debug|x86
@@ -838,8 +838,8 @@ Global
 		{80D4F5CA-1065-4487-8FDE-9FEE9821716C}.Release|x86.Build.0 = Release|x86
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|x64.Build.0 = Debug|Any CPU
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Debug|x86.ActiveCfg = Debug|x86
@@ -854,8 +854,8 @@ Global
 		{718C5421-B0C6-493A-91FA-471B9C48883E}.Release|x86.Build.0 = Release|x86
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Debug|x86.ActiveCfg = Debug|x86
@@ -870,8 +870,8 @@ Global
 		{D7C663BD-E6BA-45F6-91C3-11450CEE7FC3}.Release|x86.Build.0 = Release|x86
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|x64.Build.0 = Debug|Any CPU
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Debug|x86.ActiveCfg = Debug|x86
@@ -886,8 +886,8 @@ Global
 		{8011F38B-5A4B-4FE7-8E1B-BD9D14905FFC}.Release|x86.Build.0 = Release|x86
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Debug|x86.ActiveCfg = Debug|x86
@@ -902,8 +902,8 @@ Global
 		{5D68EFC4-EE17-4754-BBF8-8CFF06B59F12}.Release|x86.Build.0 = Release|x86
 		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{6469A920-5763-4853-858D-455FA43894B8}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{6469A920-5763-4853-858D-455FA43894B8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6469A920-5763-4853-858D-455FA43894B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6469A920-5763-4853-858D-455FA43894B8}.Debug|x86.ActiveCfg = Debug|x86
@@ -918,8 +918,8 @@ Global
 		{6469A920-5763-4853-858D-455FA43894B8}.Release|x86.Build.0 = Release|x86
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Debug|x86.ActiveCfg = Debug|x86
@@ -934,8 +934,8 @@ Global
 		{4E89A142-E8E6-4936-A76E-7AB40867BF4F}.Release|x86.Build.0 = Release|x86
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Debug|x86.ActiveCfg = Debug|x86
@@ -950,8 +950,8 @@ Global
 		{77586540-30D1-4A2E-B42D-DADA1738BB0A}.Release|x86.Build.0 = Release|x86
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Debug|x86.ActiveCfg = Debug|x86
@@ -966,8 +966,8 @@ Global
 		{BD6DC847-5389-47AB-9F7C-0D25CA59C7EB}.Release|x86.Build.0 = Release|x86
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|x64.Build.0 = Debug|Any CPU
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Debug|x86.ActiveCfg = Debug|x86
@@ -982,8 +982,8 @@ Global
 		{2536113C-36B7-4537-B1F0-22FCA97006AB}.Release|x86.Build.0 = Release|x86
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -998,8 +998,8 @@ Global
 		{2CDD21B9-CEE4-416C-A0FA-19364A795AC6}.Release|x86.Build.0 = Release|x86
 		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED49D168-61BA-402C-863A-2F1A94774375}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1030,8 +1030,8 @@ Global
 		{0D2B555B-3DF7-460B-843B-F9F3145135BD}.Release|x86.Build.0 = Release|x86
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|x64.Build.0 = Debug|Any CPU
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1046,8 +1046,8 @@ Global
 		{50A91F69-690C-40D3-ADFC-AA2CD6433A59}.Release|x86.Build.0 = Release|x86
 		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B796235-CF28-4885-8D6D-1F342AD9B642}.Debug|x86.ActiveCfg = Debug|Any CPU

diff --git a/Tests/Infra/Tests.Infra.HTMLEngineTesterHelper/Windowless/TestBase.cs b/Tests/Infra/Tests.Infra.HTMLEngineTesterHelper/Windowless/TestBase.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Neutronium.Core;
 using Neutronium.Core.Binding;
-using Neutronium.Core.Infra;
 using Neutronium.Core.WebBrowserEngine.JavascriptObject;
 using Neutronium.Core.WebBrowserEngine.Window;
 using Tests.Infra.WebBrowserEngineTesterHelper.Context;
@@ -11,8 +10,8 @@
 using Xunit.Abstractions;
 using Neutronium.Core.Log;
 
-namespace Tests.Infra.WebBrowserEngineTesterHelper.Windowless 
- {
+namespace Tests.Infra.WebBrowserEngineTesterHelper.Windowless
+{
     public abstract class TestBase 
     {
         protected IWebView _WebView;
@@ -43,6 +42,15 @@ protected void Test(Action act, TestContext ipath = TestContext.Index)
             }
         }
 
+        protected async Task TestAsync(Func<Task> act, TestContext ipath = TestContext.Index)
+        {
+            using (Tester(ipath))
+            {
+                Init();
+                await DoSafeAsync(act);
+            }
+        }
+
         protected virtual IWindowlessHTMLEngine Tester(TestContext context = TestContext.Index) 
         {
             var tester = _TestEnvironment.Build();
@@ -99,5 +107,10 @@ protected void DoSafe(Action doact)
         {
             _WebView.Run(doact);
         }
+
+        protected async Task DoSafeAsync(Func<Task> doact)
+        {
+            await await _WebView.EvaluateAsync(doact);
+        }
     }
 }