diff --git a/composer.json b/composer.json
index 9be7448..a64abda 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
 		"phpcompatibility/php-compatibility": "*",
 		"wp-coding-standards/wpcs": "*",
 		"phpunit/phpunit": "^8.5",
-		"yoast/phpunit-polyfills": "^2.0"
+		"yoast/phpunit-polyfills": "^2.0",
+		"wp-phpunit/wp-phpunit": "^6.7"
 	},
 	"require": {
 		"php": ">=7.4"
diff --git a/package.json b/package.json
index 8770a98..f72b645 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
 		"format": "wp-scripts format",
 		"wp-env": "wp-env",
 		"release": "composer run build && npm run build && npm run plugin-zip",
-		"test:unit": "./vendor/bin/phpunit"
+		"test:unit": "./vendor/bin/phpunit --configuration ./tests/unit/phpunit.xml",
+		"test:integration": "wp-env run tests-cli --env-cwd=wp-content/plugins/advanced-query-loop ./vendor/bin/phpunit --configuration ./tests/integration/phpunit.xml"
 	},
 	"files": [
 		"build",
diff --git a/phpcs.xml b/phpcs.xml
index 484a7f1..eaef45a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -39,6 +39,8 @@
 
 		<!-- Dont need to capitalize first letter -->
 		<exclude name="Generic.Commenting.DocComment.ShortNotCapital"/>
+
+
 	</rule>
 
 	<rule ref="WordPress-Extra">
@@ -64,6 +66,7 @@
 
 		<!-- Allow shorthand array syntax -->
 		<exclude name="Generic.Arrays.DisallowShortArraySyntax.Found"/>
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found"/>
 
 		<!-- Allow WP global modification -->
 		<exclude name="WordPress.WP.GlobalVariablesOverride.Prohibited"/>
diff --git a/tests/integration/bootstrap.php b/tests/integration/bootstrap.php
new file mode 100644
index 0000000..ea42c07
--- /dev/null
+++ b/tests/integration/bootstrap.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * PHPUnit bootstrap file
+ *
+ * @package features-plugin-v2
+ */
+
+define( 'TESTS_PLUGIN_DIR', dirname( __DIR__ ) );
+define( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH', dirname( TESTS_PLUGIN_DIR ) . '/vendor/yoast/phpunit-polyfills' );
+
+// Determine correct location for plugins directory to use.
+define( 'WP_PLUGIN_DIR', dirname( dirname( TESTS_PLUGIN_DIR ) ) );
+
+define( 'WP_PHPUNIT__DIR', dirname( TESTS_PLUGIN_DIR ) . '/vendor/wp-phpunit/wp-phpunit/' );
+
+// Load Composer dependencies if applicable.
+if ( file_exists( dirname( TESTS_PLUGIN_DIR ) . '/vendor/autoload.php' ) ) {
+	require_once dirname( TESTS_PLUGIN_DIR ) . '/vendor/autoload.php';
+}
+
+// Detect where to load the WordPress tests environment from.
+
+$_test_root = WP_PHPUNIT__DIR;
+
+require_once $_test_root . '/includes/functions.php';
+
+/**
+ * Load plugin in test env.
+ *
+ * @return void
+ */
+function features_plugin_unit_test_load_plugin_file() {
+	require_once dirname( TESTS_PLUGIN_DIR ) . '/index.php';
+}
+
+tests_add_filter( 'muplugins_loaded', 'features_plugin_unit_test_load_plugin_file' );
+
+require $_test_root . '/includes/bootstrap.php';
diff --git a/tests/integration/phpunit.xml b/tests/integration/phpunit.xml
new file mode 100644
index 0000000..1ffbeac
--- /dev/null
+++ b/tests/integration/phpunit.xml
@@ -0,0 +1,17 @@
+<phpunit
+  bootstrap="./bootstrap.php"
+  backupGlobals="false"
+  colors="true"
+  convertErrorsToExceptions="true"
+  convertNoticesToExceptions="true"
+  convertWarningsToExceptions="true"
+>
+  <testsuites>
+    <testsuite name="unittest">
+      <directory suffix="_Tests.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="WP_PHPUNIT__TESTS_CONFIG" value="/wordpress-phpunit/wp-tests-config.php"/>
+</php>
+</phpunit>
\ No newline at end of file
diff --git a/tests/integration/tests/Filter_Tests.php b/tests/integration/tests/Filter_Tests.php
new file mode 100644
index 0000000..c9ee3b4
--- /dev/null
+++ b/tests/integration/tests/Filter_Tests.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Test the filter
+ */
+namespace AdvancedQueryLoop\Tests\Integration;
+
+use AdvancedQueryLoop\Query_Params_Generator;
+
+/**
+ * Test the filter
+ */
+class AQL_Filter_Tests extends \WP_UnitTestCase {
+
+	public function test_tax_query_add_items_to_custom_tax_query() {
+
+		$expected_query_args = [
+			'tax_query' => [
+				[
+					'taxonomy'         => 'category',
+					'terms'            => [ 1 ],
+					'include_children' => true,
+					'operator'         => 'IN',
+				],
+				[
+					'taxonomy'         => 'recipe_category',
+					'field'            => 'slug',
+					'terms'            => 'pasta',
+					'operator'         => 'NOT IN',
+					'include_children' => false,
+				],
+			],
+		];
+
+		$default_params_from_block = [];
+
+		$custom_params_from_aql = [
+			'tax_query' => [
+				'queries'  => [
+					[
+						'id'               => '9aa9887e-e61b-42e0-bc5d-3b8c60337a3b',
+						'taxonomy'         => 'category',
+						'terms'            => [ 'Uncategorized' ],
+						'include_children' => true,
+						'operator'         => 'IN',
+					],
+				],
+			],
+		];
+
+		$qpg = new Query_Params_Generator( $default_params_from_block, $custom_params_from_aql );
+
+		add_filter(
+			'aql_query_vars',
+			function ( $query_args, $default_params, $context ) {
+				$query_args['tax_query'][] = array(
+					'taxonomy'         => 'recipe_category',
+					'field'            => 'slug',
+					'terms'            => 'pasta',
+					'operator'         => 'NOT IN',
+					'include_children' => false,
+				);
+				return $query_args;
+			},
+			10,
+			3
+		);
+
+		$qpg->process_all();
+		$query_args          = $qpg->get_query_args();
+		$filtered_query_args = \apply_filters(
+			'aql_query_vars',
+			$query_args,
+			$default_params_from_block,
+			false
+		);
+		// Assertions
+		$this->assertSame( $expected_query_args, array_merge( $default_params_from_block, $filtered_query_args ) );
+	}
+
+	public function test_tax_query_add_items_to_default_tax_query() {}
+
+}
diff --git a/phpunit.xml b/tests/unit/phpunit.xml
similarity index 89%
rename from phpunit.xml
rename to tests/unit/phpunit.xml
index 07ee568..e1a25e0 100644
--- a/phpunit.xml
+++ b/tests/unit/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
+         bootstrap="../../vendor/autoload.php"
          cacheResultFile=".phpunit.cache/test-results"
          executionOrder="depends,defects"
          forceCoversAnnotation="true"
@@ -12,7 +12,7 @@
          verbose="true">
     <testsuites>
          <testsuite name="default">
-			<directory suffix=".php">tests/unit</directory>
+			<directory suffix=".php">tests</directory>
 		</testsuite>
     </testsuites>
 
diff --git a/tests/unit/Date_Query_Tests.php b/tests/unit/tests/Date_Query_Tests.php
similarity index 100%
rename from tests/unit/Date_Query_Tests.php
rename to tests/unit/tests/Date_Query_Tests.php
diff --git a/tests/unit/Exclude_Current_Tests.php b/tests/unit/tests/Exclude_Current_Tests.php
similarity index 100%
rename from tests/unit/Exclude_Current_Tests.php
rename to tests/unit/tests/Exclude_Current_Tests.php
diff --git a/tests/unit/Multiple_Post_Types_Tests.php b/tests/unit/tests/Multiple_Post_Types_Tests.php
similarity index 100%
rename from tests/unit/Multiple_Post_Types_Tests.php
rename to tests/unit/tests/Multiple_Post_Types_Tests.php
diff --git a/tests/unit/Query_Params_Generator_Tests.php b/tests/unit/tests/Query_Params_Generator_Tests.php
similarity index 100%
rename from tests/unit/Query_Params_Generator_Tests.php
rename to tests/unit/tests/Query_Params_Generator_Tests.php