diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index f55925afd..ddc1048e8 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -84,7 +84,7 @@ ctrl_interface_group=0
 ##### IEEE 802.11 related configuration #######################################
 
 # SSID to be used in IEEE 802.11 management frames
-ssid=test
+ssid=testnetwork
 # Alternative formats for configuring SSID
 # (double quoted string, hexdump, printf-escaped string)
 #ssid2="test"
@@ -152,7 +152,7 @@ ssid=test
 # This special case is currently supported only with drivers with which
 # offloaded ACS is used.
 # Default: IEEE 802.11b
-hw_mode=g
+hw_mode=b
 
 # Channel number (IEEE 802.11)
 # (default: 0, i.e., not set)
@@ -1505,7 +1505,7 @@ own_ip_addr=127.0.0.1
 # Note that WPA3 is also configured with bit1 since it uses RSN just like WPA2.
 # In other words, for WPA3, wpa=2 is used the configuration (and
 # wpa_key_mgmt=SAE for WPA3-Personal instead of wpa_key_mgmt=WPA-PSK).
-#wpa=2
+wpa=2
 
 # WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
 # secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
@@ -1514,7 +1514,7 @@ own_ip_addr=127.0.0.1
 # wpa_psk (dot11RSNAConfigPSKValue)
 # wpa_passphrase (dot11RSNAConfigPSKPassPhrase)
 #wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-#wpa_passphrase=secret passphrase
+wpa_passphrase=abcdefgh
 
 # Optionally, WPA PSKs can be read from a separate text file (containing list
 # of (PSK,MAC address) pairs. This allows more than one PSK to be configured.
@@ -1571,7 +1571,7 @@ own_ip_addr=127.0.0.1
 # Pairwise cipher for WPA (v1) (default: TKIP)
 #wpa_pairwise=TKIP CCMP
 # Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value)
-#rsn_pairwise=CCMP
+rsn_pairwise=CCMP
 
 # Optional override for automatic group cipher selection
 # This can be used to select a specific group cipher regardless of which
@@ -1579,7 +1579,7 @@ own_ip_addr=127.0.0.1
 # overriding the group cipher with an unexpected value can result in
 # interoperability issues and in general, this parameter is mainly used for
 # testing purposes.
-#group_cipher=CCMP
+group_cipher=CCMP
 
 # Time interval for rekeying GTK (broadcast/multicast encryption keys) in
 # seconds. (dot11RSNAConfigGroupRekeyTime)
diff --git a/research/client.conf b/research/client.conf
new file mode 100644
index 000000000..f5b0fed2f
--- /dev/null
+++ b/research/client.conf
@@ -0,0 +1,7 @@
+ctrl_interface=wpasupp_ctrl
+
+network={
+	ssid="testnetwork"
+	psk="abcdefgh"
+	#key_mgmt=NONE
+}
diff --git a/research/hostapd.conf b/research/hostapd.conf
new file mode 120000
index 000000000..4949475dd
--- /dev/null
+++ b/research/hostapd.conf
@@ -0,0 +1 @@
+../hostapd/hostapd.conf
\ No newline at end of file
diff --git a/research/init.sh b/research/init.sh
new file mode 100755
index 000000000..edd3677b1
--- /dev/null
+++ b/research/init.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+sudo modprobe mac80211_hwsim radios=4
+sleep 2
+ip link set wlan3 down
+iw wlan3 set type monitor
+ip link set wlan3 up
+iw wlan3 set channel 1
diff --git a/research/start_ap.sh b/research/start_ap.sh
new file mode 100755
index 000000000..f14a9c837
--- /dev/null
+++ b/research/start_ap.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+../hostapd/hostapd ../hostapd/hostapd.conf -dd -K
diff --git a/research/start_sta.sh b/research/start_sta.sh
new file mode 100755
index 000000000..98fc99995
--- /dev/null
+++ b/research/start_sta.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+../wpa_supplicant/wpa_supplicant -D nl80211 -i wlan1 -c client.conf -dd -K
diff --git a/research/start_sta2.sh b/research/start_sta2.sh
new file mode 100755
index 000000000..106ce174b
--- /dev/null
+++ b/research/start_sta2.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+../wpa_supplicant/wpa_supplicant -D nl80211 -i wlan2 -c client.conf -dd -K
diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index c8091fee9..4874f1302 100644
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -607,3 +607,5 @@ CONFIG_BGSCAN_SIMPLE=y
 
 # Device Provisioning Protocol (DPP)
 CONFIG_DPP=y
+
+CONFIG_TESTING_OPTIONS=y