diff --git a/test/modules/auxiliary/scanner/smb/smb_enumshares.json b/test/modules/auxiliary/scanner/smb/smb_enumshares.json
index db9ba7493f..3e2e363cbe 100644
--- a/test/modules/auxiliary/scanner/smb/smb_enumshares.json
+++ b/test/modules/auxiliary/scanner/smb/smb_enumshares.json
@@ -1,68 +1,62 @@
-{
-	"TEST_NAME": 			"smb_enumshares test",
-	"REPORT_PREFIX":		"SmbEnumSharesTest",
-	"FRAMEWORK_BRANCH": 		"upstream/master",
-	"HTTP_PORT":			5309,
-	"STARTING_LISTENER":		30000,
-	"CREDS_FILE":			"../JSON/creds.json",
-	"MSF_HOSTS":
-	[
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"VM_TOOLS_UPLOAD",
-			"HYPERVISOR_CONFIG":    "../JSON/esxi_config.json",
-			"CPE":			"cpe:/a:rapid7:metasploit:::",
-			"MSF_ARTIFACT_PATH":	"/home/msfuser/rapid7/test_artifacts",
-			"MSF_PATH":		"/home/msfuser/rapid7/metasploit-framework"
-		}
-	],
-
-	"TARGETS":
-	[
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"EXPLOIT",
-			"CPE":			"cpe:/o:microsoft:windows_server_2008:r2:sp1:x64",
-			"MODULES":	
-			[
-				{
-					"NAME":		"auxiliary/scanner/smb/smb_enumshares",
-					"SETTINGS":	[
-								"smbuser=vagrant",
-								"smbpass=vagrant"
-							]
-				}
-			]
-		},
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"EXPLOIT",
-			"CPE":			"cpe:/o:microsoft:windows_server_2016:::x64",
-			"MODULES":	
-			[
-				{
-					"NAME":		"auxiliary/scanner/smb/smb_enumshares",
-					"SETTINGS":	[
-								"smbuser=vagrant",
-								"smbpass=vagrant"
-							]
-				}
-			]
-		}
-	],
-	"TARGET_GLOBALS":
-	{
-			"TYPE":			"VIRTUAL",
-			"HYPERVISOR_CONFIG":	"../JSON/esxi_config.json",
-			"METHOD":		"VM_TOOLS_UPLOAD",
-			"PAYLOAD_DIRECTORY":	"C:\\payload_test",
-			"TESTING_SNAPSHOT":	"TESTING_BASE",
-			"PYTHON":		"C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_PYTHON":	"C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_JAVA":	"C:\\software\\x86\\java\\bin\\java.exe"
-	},
-	"COMMAND_LIST": [],
-	"SUCCESS_LIST": [
-		"IPC$"
-	]
-}
+{
+    "COMMAND_LIST": [],
+    "CREDS_FILE": "../JSON/creds.json",
+    "FRAMEWORK_BRANCH": "upstream/master",
+    "HTTP_PORT": 5309,
+    "MSF_HOSTS": [
+        {
+            "CPE": "cpe:/a:rapid7:metasploit:::",
+            "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+            "METHOD": "VM_TOOLS_UPLOAD",
+            "MSF_ARTIFACT_PATH": "/home/msfuser/rapid7/test_artifacts",
+            "MSF_PATH": "/home/msfuser/rapid7/metasploit-framework",
+            "TYPE": "VIRTUAL"
+        }
+    ],
+    "REPORT_PREFIX": "SmbEnumSharesTest",
+    "STARTING_LISTENER": 30000,
+    "SUCCESS_LIST": [
+        "IPC$"
+    ],
+    "TARGETS": [
+        {
+            "CPE": "cpe:/o:microsoft:windows_server_2008:r2:sp1:x64",
+            "METHOD": "EXPLOIT",
+            "MODULES": [
+                {
+                    "NAME": "auxiliary/scanner/smb/smb_enumshares",
+                    "SETTINGS": [
+                        "smbuser=vagrant",
+                        "smbpass=vagrant"
+                    ]
+                }
+            ],
+            "TYPE": "VIRTUAL"
+        },
+        {
+            "CPE": "cpe:/o:microsoft:windows_server_2016:::x64",
+            "METHOD": "EXPLOIT",
+            "MODULES": [
+                {
+                    "NAME": "auxiliary/scanner/smb/smb_enumshares",
+                    "SETTINGS": [
+                        "smbuser=vagrant",
+                        "smbpass=vagrant"
+                    ]
+                }
+            ],
+            "TYPE": "VIRTUAL"
+        }
+    ],
+    "TARGET_GLOBALS": {
+        "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+        "METERPRETER_JAVA": "C:\\software\\x86\\java\\bin\\java.exe",
+        "METERPRETER_PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "METHOD": "VM_TOOLS_UPLOAD",
+        "PAYLOAD_DIRECTORY": "C:\\payload_test",
+        "PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "TESTING_SNAPSHOT": "TESTING_BASE",
+        "TYPE": "VIRTUAL"
+    },
+    "TEST_NAME": "smb_enumshares test"
+}
diff --git a/test/modules/auxiliary/scanner/smb/smb_enumusers.json b/test/modules/auxiliary/scanner/smb/smb_enumusers.json
index 6e3e2bd416..2727ab7b2d 100644
--- a/test/modules/auxiliary/scanner/smb/smb_enumusers.json
+++ b/test/modules/auxiliary/scanner/smb/smb_enumusers.json
@@ -1,68 +1,62 @@
-{
-	"TEST_NAME": 			"smb_enumusers test",
-	"REPORT_PREFIX":		"SmbEnumUsersTest",
-	"FRAMEWORK_BRANCH": 		"upstream/master",
-	"HTTP_PORT":			5309,
-	"STARTING_LISTENER":		30000,
-	"CREDS_FILE":			"../JSON/creds.json",
-	"MSF_HOSTS":
-	[
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"VM_TOOLS_UPLOAD",
-			"HYPERVISOR_CONFIG":    "../JSON/esxi_config.json",
-			"CPE":			"cpe:/a:rapid7:metasploit:::",
-			"MSF_ARTIFACT_PATH":	"/home/msfuser/rapid7/test_artifacts",
-			"MSF_PATH":		"/home/msfuser/rapid7/metasploit-framework"
-		}
-	],
-
-	"TARGETS":
-	[
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"EXPLOIT",
-			"CPE":			"cpe:/o:microsoft:windows_server_2008:r2:sp1:x64",
-			"MODULES":	
-			[
-				{
-					"NAME":		"auxiliary/scanner/smb/smb_enumusers",
-					"SETTINGS":	[
-								"smbuser=vagrant",
-								"smbpass=vagrant"
-							]
-				}
-			]
-		},
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"EXPLOIT",
-			"CPE":			"cpe:/o:microsoft:windows_server_2016:::x64",
-			"MODULES":	
-			[
-				{
-					"NAME":		"auxiliary/scanner/smb/smb_enumusers",
-					"SETTINGS":	[
-								"smbuser=vagrant",
-								"smbpass=vagrant"
-							]
-				}
-			]
-		}
-	],
-	"TARGET_GLOBALS":
-	{
-			"TYPE":			"VIRTUAL",
-			"HYPERVISOR_CONFIG":	"../JSON/esxi_config.json",
-			"METHOD":		"VM_TOOLS_UPLOAD",
-			"PAYLOAD_DIRECTORY":	"C:\\payload_test",
-			"TESTING_SNAPSHOT":	"TESTING_BASE",
-			"PYTHON":		"C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_PYTHON":	"C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_JAVA":	"C:\\software\\x86\\java\\bin\\java.exe"
-	},
-	"COMMAND_LIST": [],
-	"SUCCESS_LIST": [
-		"Administrator"
-	]
-}
+{
+    "COMMAND_LIST": [],
+    "CREDS_FILE": "../JSON/creds.json",
+    "FRAMEWORK_BRANCH": "upstream/master",
+    "HTTP_PORT": 5309,
+    "MSF_HOSTS": [
+        {
+            "CPE": "cpe:/a:rapid7:metasploit:::",
+            "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+            "METHOD": "VM_TOOLS_UPLOAD",
+            "MSF_ARTIFACT_PATH": "/home/msfuser/rapid7/test_artifacts",
+            "MSF_PATH": "/home/msfuser/rapid7/metasploit-framework",
+            "TYPE": "VIRTUAL"
+        }
+    ],
+    "REPORT_PREFIX": "SmbEnumUsersTest",
+    "STARTING_LISTENER": 30000,
+    "SUCCESS_LIST": [
+        "Administrator"
+    ],
+    "TARGETS": [
+        {
+            "CPE": "cpe:/o:microsoft:windows_server_2008:r2:sp1:x64",
+            "METHOD": "EXPLOIT",
+            "MODULES": [
+                {
+                    "NAME": "auxiliary/scanner/smb/smb_enumusers",
+                    "SETTINGS": [
+                        "smbuser=vagrant",
+                        "smbpass=vagrant"
+                    ]
+                }
+            ],
+            "TYPE": "VIRTUAL"
+        },
+        {
+            "CPE": "cpe:/o:microsoft:windows_server_2016:::x64",
+            "METHOD": "EXPLOIT",
+            "MODULES": [
+                {
+                    "NAME": "auxiliary/scanner/smb/smb_enumusers",
+                    "SETTINGS": [
+                        "smbuser=vagrant",
+                        "smbpass=vagrant"
+                    ]
+                }
+            ],
+            "TYPE": "VIRTUAL"
+        }
+    ],
+    "TARGET_GLOBALS": {
+        "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+        "METERPRETER_JAVA": "C:\\software\\x86\\java\\bin\\java.exe",
+        "METERPRETER_PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "METHOD": "VM_TOOLS_UPLOAD",
+        "PAYLOAD_DIRECTORY": "C:\\payload_test",
+        "PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "TESTING_SNAPSHOT": "TESTING_BASE",
+        "TYPE": "VIRTUAL"
+    },
+    "TEST_NAME": "smb_enumusers test"
+}
diff --git a/test/modules/exploits/windows/smb/psexec.json b/test/modules/exploits/windows/smb/psexec.json
index 3cecc852ab..186fdf8607 100644
--- a/test/modules/exploits/windows/smb/psexec.json
+++ b/test/modules/exploits/windows/smb/psexec.json
@@ -1,99 +1,93 @@
-{
-	"FRAMEWORK_BRANCH": 		"upstream/master",
-	"HTTP_PORT":			5309,
-	"STARTING_LISTENER":		30000,
-	"CREDS_FILE":                   "../JSON/creds.json",
-	"MSF_HOSTS":
-	[
-		{
-			"TYPE":			"VIRTUAL",
-			"METHOD":		"VM_TOOLS_UPLOAD",
-			"HYPERVISOR_CONFIG":	"../JSON/esxi_config.json",
-			"CPE":			"cpe:/a:rapid7:metasploit:::",
-			"MSF_PATH":		"/home/msfuser/rapid7/metasploit-framework",
-			"MSF_ARTIFACT_PATH":	"/home/msfuser/rapid7/test_artifacts"
-		}
-	],
-	"TARGET_GLOBALS":
-	{
-			"TYPE":                 "VIRTUAL",
-			"HYPERVISOR_CONFIG":    "../JSON/esxi_config.json",
-			"METHOD":               "EXPLOIT",
-			"PAYLOAD_DIRECTORY":    "C:\\payload_test",
-			"PYTHON":               "C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_PYTHON":   "C:\\software\\x86\\python27\\python.exe",
-			"METERPRETER_JAVA":     "C:\\software\\x86\\java\\bin\\java.exe"
-	},
-	"TARGETS":
-	[
-		{
-		  	"CPE":				"cpe:/o:microsoft:windows_7:::x64"
-		},
-		{
-			"CPE":				"cpe:/o:microsoft:windows_10:::x64"
-		}
-	],
-	"MODULES":
-	[
-			{
-					"NAME":         "exploit/windows/smb/psexec",
-					"SETTINGS":
-					[
-							"SMBUser=vagrant",
-							"SMBPass=vagrant"
-					]
-			}
-	],
-	"PAYLOADS":
-	[
-		{
-			"NAME":		"windows/x64/meterpreter/reverse_tcp",
-			"SETTINGS":	[]
-		}
-	],
-	"COMMAND_LIST": [
-		"<ruby>",
-		"sleep(60)",
-		"</ruby>",
-		"sessions -C sessions -l",
-		"<ruby>",
-		"sleep(60)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"<ruby>",
-		"sleep(10)",
-		"</ruby>",
-		"sessions -C sysinfo",
-		"sessions -C ifconfig",
-		"sessions -C sessions -l",
-		"sessions -C getuid",
-		"sessions -C exit"
-	],
-	"SUCCESS_LIST": [
-		"Session 1 created in the background"
-	]
-}
+{
+    "COMMAND_LIST": [
+        "<ruby>",
+        "sleep(60)",
+        "</ruby>",
+        "sessions -C sessions -l",
+        "<ruby>",
+        "sleep(60)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "<ruby>",
+        "sleep(10)",
+        "</ruby>",
+        "sessions -C sysinfo",
+        "sessions -C ifconfig",
+        "sessions -C sessions -l",
+        "sessions -C getuid",
+        "sessions -C exit"
+    ],
+    "CREDS_FILE": "../JSON/creds.json",
+    "FRAMEWORK_BRANCH": "upstream/master",
+    "HTTP_PORT": 5309,
+    "MODULES": [
+        {
+            "NAME": "exploit/windows/smb/psexec",
+            "SETTINGS": [
+                "SMBUser=vagrant",
+                "SMBPass=vagrant"
+            ]
+        }
+    ],
+    "MSF_HOSTS": [
+        {
+            "CPE": "cpe:/a:rapid7:metasploit:::",
+            "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+            "METHOD": "VM_TOOLS_UPLOAD",
+            "MSF_ARTIFACT_PATH": "/home/msfuser/rapid7/test_artifacts",
+            "MSF_PATH": "/home/msfuser/rapid7/metasploit-framework",
+            "TYPE": "VIRTUAL"
+        }
+    ],
+    "PAYLOADS": [
+        {
+            "NAME": "windows/x64/meterpreter/reverse_tcp",
+            "SETTINGS": []
+        }
+    ],
+    "STARTING_LISTENER": 30000,
+    "SUCCESS_LIST": [
+        "Session 1 created in the background"
+    ],
+    "TARGETS": [
+        {
+            "CPE": "cpe:/o:microsoft:windows_7:::x64"
+        },
+        {
+            "CPE": "cpe:/o:microsoft:windows_10:::x64"
+        }
+    ],
+    "TARGET_GLOBALS": {
+        "HYPERVISOR_CONFIG": "../JSON/esxi_config.json",
+        "METERPRETER_JAVA": "C:\\software\\x86\\java\\bin\\java.exe",
+        "METERPRETER_PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "METHOD": "EXPLOIT",
+        "PAYLOAD_DIRECTORY": "C:\\payload_test",
+        "PYTHON": "C:\\software\\x86\\python27\\python.exe",
+        "TYPE": "VIRTUAL"
+    }
+}