diff --git a/cf7-antispam.php b/cf7-antispam.php
index 5ee1f46..e31c56c 100644
--- a/cf7-antispam.php
+++ b/cf7-antispam.php
@@ -15,7 +15,6 @@
 use CF7_AntiSpam\Core\CF7_AntiSpam;
 use CF7_AntiSpam\Core\CF7_AntiSpam_Activator;
 use CF7_AntiSpam\Core\CF7_AntiSpam_Deactivator;
-use CF7_AntiSpam\Core\WPCF7_Service;
 use CF7_AntiSpam\Core\CF7_AntiSpam_Uninstaller;
 
 if ( ! defined( 'WPINC' ) ) {
diff --git a/composer.json b/composer.json
index eef7429..e2b03cf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,9 @@
 	"phpunit/phpunit": "^9.6.13",
 	"wp-phpunit/wp-phpunit": "^5.9.5",
 	"yoast/phpunit-polyfills": "^1.1",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7"
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+	  "ext-dom": "*",
+	  "ext-libxml": "*"
   },
   "require": {
 	"geoip2/geoip2": "~2.0",
diff --git a/core/CF7_AntiSpam_Frontend.php b/core/CF7_AntiSpam_Frontend.php
index 654d438..ce94be8 100644
--- a/core/CF7_AntiSpam_Frontend.php
+++ b/core/CF7_AntiSpam_Frontend.php
@@ -71,8 +71,8 @@ public function __construct( $plugin_name, $version ) {
 	public function cf7a_honeypot_add( $form_elements ) {
 		/* A list of default names for the honeypot fields. */
 		$options     = get_option( 'cf7a_options', array() );
-		$input_names = get_honeypot_input_names( $options['honeypot_input_names'] );
-		$input_class = sanitize_html_class( $this->options['cf7a_customizations_class'] );
+		$input_names = !empty( $options['honeypot_input_names'] ) ? get_honeypot_input_names( $options['honeypot_input_names'] ) : array();
+		$input_class = !empty( $this->options['cf7a_customizations_class'] ) ? sanitize_html_class( $this->options['cf7a_customizations_class'] ) : 'cf7a';
 		/**
 		 * Controls the maximum number of honeypots.
 		 *
@@ -91,7 +91,8 @@ public function cf7a_honeypot_add( $form_elements ) {
 		/* add honeypot fields */
 		foreach ( $inputs as $i => $input ) {
 			if ( stripos( $input, 'type="text"' ) !== false ) {
-				$honeypot_names = $input_names[ $i ];
+				// TODO: add set of default values
+				$honeypot_names = isset( $input_names[ $i ] ) ? $input_names[ $i ] : 'hey_' . $i;
 				$honeypot_input = sprintf(
 					'<input type="text" name="%1$s" value="" autocomplete="fill" class="%2$s" tabindex="-1" />',
 					esc_attr( $honeypot_names ),
diff --git a/package.json b/package.json
index bb2902b..150047b 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
 		"preplugin-zip": "wp-env run composer \"composer install --no-dev\"",
 		"plugin-zip": "wp-scripts plugin-zip",
 		"postplugin-zip": "wp-env run composer \"composer install\"",
-		"lint:css": "wp-scripts lint-style ./admin/src/**/*.scss --fix",
-		"lint:js": "wp-scripts lint-js  ./includes/src ./admin/src",
+		"lint:css": "wp-scripts lint-style ./src/**/*.scss --fix",
+		"lint:js": "wp-scripts lint-js  ./src/**/*.js",
 		"packages-update": "wp-scripts packages-update",
 		"wp-env:start": "wp-env start",
 		"wp-env:stop": "wp-env stop",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 09f8bf6..85321ed 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit
-	bootstrap="tests/phpunit/bootstrap.php"
+	bootstrap="tests/PhpUnit/bootstrap.php"
 	backupGlobals="false"
 	colors="true"
 	convertErrorsToExceptions="true"
diff --git a/tests/phpunit/tests/CF7_AntiSpam_ActivatorTest.php b/tests/PhpUnit/Tests/CF7_AntiSpam_ActivatorTest.php
similarity index 95%
rename from tests/phpunit/tests/CF7_AntiSpam_ActivatorTest.php
rename to tests/PhpUnit/Tests/CF7_AntiSpam_ActivatorTest.php
index 9e69789..6f610f9 100644
--- a/tests/phpunit/tests/CF7_AntiSpam_ActivatorTest.php
+++ b/tests/PhpUnit/Tests/CF7_AntiSpam_ActivatorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CF7_AntiSpam\Tests\PhpUnit\Tests;
+
 use PHPUnit\Framework\TestCase;
 
 class CF7_AntiSpam_ActivatorTest extends TestCase {
diff --git a/tests/phpunit/tests/CF7_AntiSpam_FiltersTest.php b/tests/PhpUnit/Tests/CF7_AntiSpam_FiltersTest.php
similarity index 98%
rename from tests/phpunit/tests/CF7_AntiSpam_FiltersTest.php
rename to tests/PhpUnit/Tests/CF7_AntiSpam_FiltersTest.php
index dd0d0dd..2fd9e29 100644
--- a/tests/phpunit/tests/CF7_AntiSpam_FiltersTest.php
+++ b/tests/PhpUnit/Tests/CF7_AntiSpam_FiltersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CF7_AntiSpam\Tests;
+namespace CF7_AntiSpam\Tests\PhpUnit\Tests;
 
 use CF7_AntiSpam\Core\CF7_AntiSpam_Filters;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/phpunit/tests/CF7_AntiSpam_FrontendTest.php b/tests/PhpUnit/Tests/CF7_AntiSpam_FrontendTest.php
similarity index 99%
rename from tests/phpunit/tests/CF7_AntiSpam_FrontendTest.php
rename to tests/PhpUnit/Tests/CF7_AntiSpam_FrontendTest.php
index a5a5b25..b5abf24 100644
--- a/tests/phpunit/tests/CF7_AntiSpam_FrontendTest.php
+++ b/tests/PhpUnit/Tests/CF7_AntiSpam_FrontendTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace CF7_AntiSpam\Tests\PhpUnit\Tests;
+
 use CF7_AntiSpam\Core\CF7_AntiSpam;
 use CF7_AntiSpam\Core\CF7_AntiSpam_Frontend;
+use DOMDocument;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/phpunit/bootstrap.php b/tests/PhpUnit/bootstrap.php
similarity index 96%
rename from tests/phpunit/bootstrap.php
rename to tests/PhpUnit/bootstrap.php
index 6dbc15b..617f885 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/PhpUnit/bootstrap.php
@@ -4,10 +4,8 @@
  *
  * @package Cf7_Antispam
  */
+
 // Debug settings for parity with WordPress Core's PHPUnit tests.
-if ( ! defined( 'WP_DEBUG' ) ) {
-	define( 'WP_DEBUG', true );
-}
 if ( ! defined( 'LOCAL_WP_DEBUG_LOG' ) ) {
 	define( 'LOCAL_WP_DEBUG_LOG', true );
 }
@@ -21,8 +19,6 @@
 	define( 'LOCAL_WP_ENVIRONMENT_TYPE', 'local' );
 }
 
-include("vendor/autoload.php");
-
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 
 if ( ! $_tests_dir ) {
diff --git a/tests/phpunit/includes/class-test-init.php b/tests/PhpUnit/includes/class-test-init.php
similarity index 100%
rename from tests/phpunit/includes/class-test-init.php
rename to tests/PhpUnit/includes/class-test-init.php
diff --git a/tests/phpunit/includes/wp-tests-config.php b/tests/PhpUnit/includes/wp-tests-config.php
similarity index 100%
rename from tests/phpunit/includes/wp-tests-config.php
rename to tests/PhpUnit/includes/wp-tests-config.php