diff --git a/includes/classes/Command.php b/includes/classes/Command.php
index 0765b1dcad..8026287553 100644
--- a/includes/classes/Command.php
+++ b/includes/classes/Command.php
@@ -121,7 +121,7 @@ public function activate_feature( $args, $assoc_args ) {
 	}
 
 	/**
-	 * Dectivate a feature.
+	 * Deactivate a feature.
 	 *
 	 * ## OPTIONS
 	 *
diff --git a/includes/classes/Feature/ProtectedContent/ProtectedContent.php b/includes/classes/Feature/ProtectedContent/ProtectedContent.php
index 2fad7c8176..8ce4b0c8f8 100644
--- a/includes/classes/Feature/ProtectedContent/ProtectedContent.php
+++ b/includes/classes/Feature/ProtectedContent/ProtectedContent.php
@@ -272,7 +272,7 @@ public function remove_fields_from_password_protected( $post_args, $post_id ) {
 	}
 
 	/**
-	 * Exclude proctected post from the frontend queries.
+	 * Exclude protected post from the frontend queries.
 	 *
 	 * @since 4.0.0
 	 *
diff --git a/includes/classes/Features.php b/includes/classes/Features.php
index 73b268b73b..d38435d015 100644
--- a/includes/classes/Features.php
+++ b/includes/classes/Features.php
@@ -49,7 +49,7 @@ public function activate_feature( $slug ) {
 	}
 
 	/**
-	 * Dectivate a feature
+	 * Deactivate a feature
 	 *
 	 * @param  string $slug Feature slug
 	 * @param  bool   $force Whether to force deactivation
diff --git a/tests/php/TestAdminNotices.php b/tests/php/TestAdminNotices.php
index a589cb77fe..1c81c4ea18 100644
--- a/tests/php/TestAdminNotices.php
+++ b/tests/php/TestAdminNotices.php
@@ -572,7 +572,7 @@ function() {
 			}
 		);
 		ElasticPress\Screen::factory()->set_current_screen( 'install' );
-		
+
 		add_filter(
 			'ep_post_pre_meta_keys_db',
 			function() {
diff --git a/tests/php/TestCommands.php b/tests/php/TestCommands.php
new file mode 100644
index 0000000000..df8584d707
--- /dev/null
+++ b/tests/php/TestCommands.php
@@ -0,0 +1,422 @@
+<?php
+/**
+ * Test WP-CLI commands.
+ *
+ * @package elasticpress
+ */
+
+namespace ElasticPressTest;
+
+use ElasticPress;
+use ElasticPress\Command;
+
+/**
+ * Commands notices test class
+ */
+class TestCommands extends BaseTestCase {
+
+	/**
+	 * Holds Command class instance.
+	 */
+	protected $command;
+
+	/**
+	 * Setup each test.
+	 *
+	 * @since 4.4.1
+	 */
+	public function set_up() {
+		$this->command = new Command();
+
+		ElasticPress\Elasticsearch::factory()->delete_all_indices();
+		ElasticPress\Indexables::factory()->get( 'post' )->put_mapping();
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		delete_option( 'ep_active_features' );
+		parent::set_up();
+	}
+
+	/**
+	 * Clean up after each test.
+	 *
+	 * @since 4.4.1
+	 */
+	public function tear_down() {
+		parent::tear_down();
+	}
+
+	/**
+	 * Test activate-feature command can activate feature.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testActivateFeature() {
+
+		$this->command->activate_feature( [ 'comments' ], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Feature activated', $output );
+	}
+
+	/**
+	 * Test activate-feature throws warning when feature needs re-index.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testActivateFeatureThrowWarnings() {
+
+		$this->command->activate_feature( [ 'comments' ], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Feature is usable but there are warnings', $output );
+		$this->assertStringContainsString( 'This feature requires a re-index. You may want to run the index command next', $output );
+	}
+
+	/**
+	 * Test activate-feature command throws error when feature is already activated.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testActivateFeatureWhenFeatureIsAlreadyActivated() {
+
+		$this->expectExceptionMessage( 'This feature is already active' );
+
+		$this->command->activate_feature( [ 'facets' ], [] );
+	}
+
+	/**
+	 * Test activate-feature command throws error when feature is not registered.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testActivateFeatureForInvalidFeature() {
+
+		$this->expectExceptionMessage( 'No feature with that slug is registered' );
+
+		$this->command->activate_feature( [ 'invalid-feature' ], [] );
+	}
+
+	/**
+	 * Test activate-feature command throws error when requirement is not met.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testActivateFeatureWhenRequirementIsNotMet() {
+
+		$this->expectExceptionMessage( 'Feature requirements are not met' );
+
+		$this->command->activate_feature( [ 'instant-results' ], [] );
+	}
+
+	/**
+	 * Test deactivate-feature command can deactivate feature.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeactivateFeature() {
+
+		$this->command->deactivate_feature( [ 'search' ], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Feature deactivated', $output );
+	}
+
+
+	/**
+	 * Test deactivate-feature command throws error when feature is already deactivated.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeactivateFeatureWhenFeatureIsAlreadyDeactivated() {
+
+		$this->expectExceptionMessage( 'Feature is not active' );
+
+		$this->command->deactivate_feature( [ 'instant-results' ], [] );
+	}
+
+	/**
+	 * Test deactivate-feature command throws error when feature is not registered.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeactivateFeatureForInvalidFeature() {
+
+		$this->expectExceptionMessage( 'No feature with that slug is registered' );
+
+		$this->command->deactivate_feature( [ 'invalid-feature' ], [] );
+	}
+
+	/**
+	 * Test list-features command can list all active features.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testListFeature() {
+
+		$this->command->list_features( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Active features:', $output );
+		$this->assertStringContainsString( 'search', $output );
+	}
+
+	/**
+	 * Test list-features command can list all features.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testListFeatureAll() {
+
+		$this->command->list_features( [], [ 'all' => true ] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Registered features:', $output );
+		$this->assertStringContainsString( 'search', $output );
+	}
+
+	/**
+	 * Test put-mapping command can put mapping for active features.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testPutMapping() {
+
+		$this->command->put_mapping( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Adding post mapping', $output );
+		$this->assertStringContainsString( 'Mapping sent', $output );
+	}
+
+	/**
+	 * Test get-mapping command returns mapping.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testGetMapping() {
+
+		$this->command->get_mapping( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertJson( $output );
+
+		ob_clean();
+
+		// test with index-name option
+		$this->command->get_mapping( [], [ 'index-name' => 'exampleorg-post-1' ] );
+		$output = $this->getActualOutputForAssertion();
+		$this->assertJson( $output );
+
+		ob_clean();
+
+		// test with pretty option
+		$this->command->get_mapping( [], [ 'pretty' => true ] );
+		$output = $this->getActualOutputForAssertion();
+		$this->assertJson( $output );
+		$this->assertStringContainsString( "[\n", $output );
+
+		ob_clean();
+
+		// test with incorrect index name
+		$this->command->get_mapping( [], [ 'index-name' => 'invalid-index' ] );
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'index_not_found_exception', $output );
+	}
+
+
+	/**
+	 * Test get-cluster-indices command returns cluster indices.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testGetClusterIndices() {
+
+		$this->command->get_cluster_indices( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertJson( $output );
+
+		// clean output buffer
+		ob_clean();
+
+		$this->command->get_cluster_indices( [], [ 'pretty' => true ] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertJson( $output );
+		$this->assertStringContainsString( "[\n", $output );
+	}
+
+	/**
+	 * Test get-indices command returns indices information.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testGetIndices() {
+
+		$this->command->get_indices( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertEquals( "[\"exampleorg-post-1\"]\n", $output );
+
+		// clean output buffer
+		ob_clean();
+
+		$this->command->get_indices( [], [ 'pretty' => true ] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( "[\n", $output );
+	}
+
+
+	/**
+	 * Test recreate-network-alias command can create aliases.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testReCreateNetworkAlias() {
+
+		$command = new Command();
+		$command->recreate_network_alias( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Recreating post network alias…', $output );
+		$this->assertStringContainsString( 'Done.', $output );
+	}
+
+	/**
+	 * Test sync command can sync content.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testSync() {
+
+		// activate comments feature
+		ElasticPress\Features::factory()->activate_feature( 'comments' );
+		ElasticPress\Features::factory()->setup_features();
+
+		// create dummy comments
+		$this->ep_factory->post->create_many( 10 );
+		$this->ep_factory->comment->create_many( 10, [ 'comment_post_ID' => $this->ep_factory->post->create() ] );
+
+		$this->command->sync( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Number of posts indexed on site 1: 11', $output );
+		$this->assertStringContainsString( 'Indexing comments on site 1', $output );
+		$this->assertStringContainsString( 'Sync complete', $output );
+		$this->assertStringContainsString( 'Total time elapsed', $output );
+		$this->assertStringContainsString( 'Done!', $output );
+	}
+
+	/**
+	 * Test sync command can ask for confirmation when setup flag is set
+	 *
+	 * @since 4.4.1
+	 */
+	public function testSyncAskForConfirmationWhenSetupIsPassed() {
+
+		$this->expectExceptionMessage( 'Indexing with setup option needs to delete Elasticsearch index first, are you sure you want to delete your Elasticsearch index?' );
+
+		$this->command->sync( [], [ 'setup' => true ] );
+	}
+
+	/**
+	 * Test status command returns status information.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testStatus() {
+
+		$this->command->status( [], [] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( '====== Status ======', $output );
+		$this->assertStringContainsString( 'exampleorg-post-1', $output );
+		$this->assertStringContainsString( '====== End Status ======', $output );
+	}
+
+	/**
+	 * Test delete-index command ask for confirmation.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeleteIndexAskForConfirmation() {
+
+		$this->expectExceptionMessage( 'Are you sure you want to delete your Elasticsearch index?' );
+
+		$this->command->delete_index( [], [] );
+	}
+
+	/**
+	 * Test delete-index command can delete index.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeleteIndex() {
+
+		// activate comments feature
+		ElasticPress\Features::factory()->activate_feature( 'comments' );
+		ElasticPress\Features::factory()->setup_features();
+
+		$this->command->delete_index( [], [ 'yes' => true ] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( "Deleting index for posts…\nIndex deleted", $output );
+		$this->assertStringContainsString( "Deleting index for comments…\nIndex deleted", $output );
+
+		// clean output buffer
+		ob_clean();
+
+		// test with index-name option
+		$this->command->delete_index(
+			[],
+			[
+				'yes'        => true,
+				'index-name' => 'exampleorg-post-1',
+			]
+		);
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertEquals( 'Index deleted', $output );
+	}
+
+	/**
+	 * Test delete-index command also delete global index.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeleteIndexGlobal() {
+
+		ElasticPress\Features::factory()->activate_feature( 'users' );
+		ElasticPress\Features::factory()->setup_features();
+
+		$this->command->delete_index( [], [ 'yes' => true ] );
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( "Deleting index for users…\nIndex deleted", $output );
+	}
+
+	/**
+	 *  Test delete-index command can delete all the indexes if network-wide flag is set.
+	 *
+	 * @since 4.4.1
+	 */
+	public function testDeleteIndexForNetwork() {
+
+		$this->factory->blog->create();
+
+		$this->command->delete_index(
+			[],
+			[
+				'yes'          => true,
+				'network-wide' => true,
+			]
+		);
+
+		$output = $this->getActualOutputForAssertion();
+		$this->assertStringContainsString( 'Deleting post index for site 1', $output );
+		$this->assertStringContainsString( 'Deleting post index for site 2', $output );
+
+	}
+
+}
diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php
index 5d01775304..48ed6cdb31 100644
--- a/tests/php/bootstrap.php
+++ b/tests/php/bootstrap.php
@@ -126,3 +126,5 @@ function skip_translations_api() {
 require_once __DIR__ . '/includes/classes/factory/CommentFactory.php';
 require_once __DIR__ . '/includes/classes/BaseTestCase.php';
 require_once __DIR__ . '/includes/classes/FeatureTest.php';
+require_once __DIR__ . '/includes/classes/mock/class-wp-cli-command.php';
+require_once __DIR__ . '/includes/classes/mock/class-wp-cli.php';
diff --git a/tests/php/features/TestProtectedContent.php b/tests/php/features/TestProtectedContent.php
index 391f9a39bf..1c733f405b 100644
--- a/tests/php/features/TestProtectedContent.php
+++ b/tests/php/features/TestProtectedContent.php
@@ -386,5 +386,55 @@ public function testFrontEndSearchPasswordedPost() {
 		// Password post is expected to return as we are logged in.
 		$this->assertEquals( 1, $query->post_count );
 		$this->assertEquals( 1, $query->found_posts );
+
+
+		// Log out and try again.
+		wp_set_current_user( 0 );
+
+		$query = new \WP_Query(
+			array(
+				's' => 'findmetitle',
+			)
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 0, $query->post_count );
+		$this->assertEquals( 0, $query->found_posts );
+	}
+
+	/**
+	 * Check admin comment query are powered by Elasticsearch
+	 *
+	 * @since 4.4.1
+	 */
+	public function testAdminCommentQuery() {
+
+		set_current_screen( 'edit-comments.php' );
+		$this->assertTrue( is_admin() );
+
+		ElasticPress\Features::factory()->activate_feature( 'comments' );
+		ElasticPress\Features::factory()->activate_feature( 'protected_content' );
+		ElasticPress\Features::factory()->setup_features();
+
+		ElasticPress\Indexables::factory()->get( 'comment' )->put_mapping();
+		ElasticPress\Indexables::factory()->get( 'comment' )->sync_manager->sync_queue = [];
+
+		// Need to call this since it's hooked to init.
+		ElasticPress\Features::factory()->get_registered_feature( 'comments' )->search_setup();
+
+
+		$this->ep_factory->comment->create( [
+			'comment_content' => 'findme',
+			'comment_post_ID' => $this->ep_factory->post->create(),
+		] );
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		$comments_query = new \WP_Comment_Query([
+			'type' => 'comment',
+		]);
+
+		$this->assertTrue( $comments_query->elasticsearch_success );
+		$this->assertEquals( 1, $comments_query->found_comments );
 	}
 }
diff --git a/tests/php/includes/classes/mock/class-wp-cli-command.php b/tests/php/includes/classes/mock/class-wp-cli-command.php
new file mode 100644
index 0000000000..c5961e9d39
--- /dev/null
+++ b/tests/php/includes/classes/mock/class-wp-cli-command.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Base class for WP-CLI commands
+ *
+ * @package wp-cli
+ */
+abstract class WP_CLI_Command {
+
+	public function __construct() {}
+}
diff --git a/tests/php/includes/classes/mock/class-wp-cli.php b/tests/php/includes/classes/mock/class-wp-cli.php
new file mode 100644
index 0000000000..22cb2a205b
--- /dev/null
+++ b/tests/php/includes/classes/mock/class-wp-cli.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Various utilities for WP-CLI commands.
+ */
+class WP_CLI {
+
+	/**
+	 * Display a log message
+	 *
+	 * @param message Message to display to the end user.
+	 */
+	public static function log( $message ) {
+		print $message;
+	}
+
+	/**
+	 * Display a success message.
+	 *
+	 * @param message Message to display to the end user.
+	 */
+	public static function success( $message ) {
+		print $message;
+	}
+
+	/**
+	 * Display debug message.
+	 *
+	 * @param message Message to display to the end user.
+	 * @param boolean                                    $group
+	 */
+	public static function debug( $message, $group = false ) {
+		print $message;
+	}
+
+	/**
+	 * Display warning message
+	 *
+	 * @param message Message to display to the end user.
+	 */
+	public static function warning( $message ) {
+		print $message;
+	}
+
+	/**
+	 * Display error message.
+	 *
+	 * @param string $message
+	 *
+	 * @return Exception
+	 */
+	public static function error( $message, $exit = true ) {
+
+		if ( ! $exit ) {
+			print $message;
+			return;
+		}
+
+		throw new Exception( $message );
+	}
+
+	/**
+	 * Colorize a string for output.
+	 *
+	 * @param string $message Message to display to the end user.
+	 */
+	public static function colorize( $message ) {
+		print $message;
+	}
+
+	/**
+	 * Display informational message without prefix.
+	 *
+	 * @param string $message Message to display to the end user.
+	 */
+	public static function line( $message ) {
+		print $message . "\n";
+	}
+
+	/**
+	 * Ask for confirmation before running a destructive operation.
+	 *
+	 * @param string $message Question to display before the prompt.
+	 * @param array  $args Skips prompt if 'yes' is provided.
+	 */
+	public static function confirm( $message, $args = [] ) {
+
+		if ( isset( $args['yes'] ) && true === $args['yes'] ) {
+			return;
+		}
+
+		throw new Exception( $message );
+	}
+
+}
diff --git a/tests/php/indexables/TestPost.php b/tests/php/indexables/TestPost.php
index bfa45200e6..883e98d6f0 100644
--- a/tests/php/indexables/TestPost.php
+++ b/tests/php/indexables/TestPost.php
@@ -6019,6 +6019,17 @@ public function testQueryDb() {
 		$this->assertEquals( $post_id_4, $post_ids[0] );
 		$this->assertCount( 1, $results['objects'] );
 		$this->assertEquals( 4, $results['total_objects'] );
+
+		// Test it pulls the post with passwords when password protected feature is enabled.
+		ElasticPress\Features::factory()->activate_feature( 'protected_content' );
+		ElasticPress\Features::factory()->setup_features();
+
+		$results = $indexable_post_object->query_db(
+			[
+				'per_page'     => 1
+			]
+		);
+		$this->assertEquals( 4, $results['total_objects'] );
 	}
 
 	/**