diff --git a/includes/ContentImport/Importers/ImportersBaseFactory.php b/includes/ContentImport/Importers/ImportersBaseFactory.php
index 453578ba..e92f8ede 100644
--- a/includes/ContentImport/Importers/ImportersBaseFactory.php
+++ b/includes/ContentImport/Importers/ImportersBaseFactory.php
@@ -111,14 +111,11 @@ public function selected() {
 	 * @return array<string, \stdClass>
 	 */
 	protected function importers_info(): array {
-		return array_combine(
-			array_keys( $this->importers_map ),
-			array_map(
-				function ( $importer_class ) {
-					return $importer_class::info();
-				},
-				$this->importers_map
-			)
+		return array_map(
+			function ( $importer_class ) {
+				return $importer_class::info();
+			},
+			$this->importers_map
 		);
 	}
 }
diff --git a/includes/ContentImport/Importers/Terms/ShallowDuplicating.php b/includes/ContentImport/Importers/Terms/ShallowDuplicating.php
index 4487c1ed..648e4574 100644
--- a/includes/ContentImport/Importers/Terms/ShallowDuplicating.php
+++ b/includes/ContentImport/Importers/Terms/ShallowDuplicating.php
@@ -59,17 +59,13 @@ public function import( array $data ) {
 			return $data;
 		}
 
-		$source_terms_ids = wp_list_pluck( $source_terms, 'term_id' );
-		$msls_terms       = array_combine(
-			$source_terms_ids,
-			array_map( array( Term::class, 'create' ), $source_terms_ids )
-		);
+		$msls_terms = array_map( array( Term::class, 'create' ), wp_list_pluck( $source_terms, 'term_id' ) );
 
 		switch_to_blog( $this->import_coordinates->dest_blog_id );
 
-		foreach ( $source_terms as $term ) {
+		foreach ( $source_terms as $key => $term ) {
 			// is there a translation for the term in this blog?
-			$msls_term    = $msls_terms[ $term->term_id ];
+			$msls_term    = $msls_terms[ $key ];
 			$dest_term_id = $msls_term->{$dest_lang};
 
 			if ( null === $dest_term_id ) {
diff --git a/tests/phpunit/Admin/TestAdmin.php b/tests/phpunit/Admin/TestAdmin.php
index c5fe4693..ebd3fc2a 100644
--- a/tests/phpunit/Admin/TestAdmin.php
+++ b/tests/phpunit/Admin/TestAdmin.php
@@ -232,7 +232,7 @@ public function test_settings_field_renders( string $method, string $expected ):
 	}
 
 
-	function test_rewrite_tizio(): void {
+	public function test_rewrite_tizio(): void {
 		$obj = $this->AdminFactory();
 
 		$post_type          = \Mockery::mock( \WP_Post_Type::class );
@@ -246,7 +246,7 @@ function test_rewrite_tizio(): void {
 		$obj->rewrite_tizio( 'tizio' );
 	}
 
-	function test_rewrite_pinko(): void {
+	public function test_rewrite_pinko(): void {
 		$obj = $this->AdminFactory();
 
 		$post_type          = \Mockery::mock( \WP_Post_Type::class );
@@ -260,7 +260,7 @@ function test_rewrite_pinko(): void {
 		$obj->rewrite_pinko( 'pinko' );
 	}
 
-	function test_rewrite_pallino(): void {
+	public function test_rewrite_pallino(): void {
 		$obj = $this->AdminFactory();
 
 		$post_type          = \Mockery::mock( \WP_Post_Type::class );
@@ -274,14 +274,14 @@ function test_rewrite_pallino(): void {
 		$obj->rewrite_pallino( 'pallino' );
 	}
 
-	function test_content_priority(): void {
+	public function test_content_priority(): void {
 		$obj = $this->AdminFactory();
 
 		$this->expectOutputRegex( '/^<select id="content_priority" name="msls\[content_priority\]">.*$/' );
 		$obj->content_priority();
 	}
 
-	function test_validate(): void {
+	public function test_validate(): void {
 		$obj = $this->AdminFactory();
 
 		$arr = array();
@@ -299,7 +299,7 @@ function test_validate(): void {
 		);
 	}
 
-	function test_set_blog_language(): void {
+	public function test_set_blog_language(): void {
 		$obj = $this->AdminFactory();
 
 		$arr = array(
@@ -309,7 +309,7 @@ function test_set_blog_language(): void {
 		$this->assertEquals( array( 'abc' => true ), $obj->set_blog_language( $arr ) );
 	}
 
-	function test_render(): void {
+	public function test_render(): void {
 		$obj = $this->AdminFactory();
 
 		Functions\expect( 'settings_fields' )->once();
@@ -321,7 +321,7 @@ function test_render(): void {
 		$obj->render();
 	}
 
-	function test_language_section(): void {
+	public function test_language_section(): void {
 		$obj = $this->AdminFactory();
 
 		Functions\when( 'add_settings_field' )->returnArg();
@@ -329,7 +329,7 @@ function test_language_section(): void {
 		$this->assertEquals( 1, $obj->language_section() );
 	}
 
-	function test_main_section(): void {
+	public function test_main_section(): void {
 		$obj = $this->AdminFactory();
 
 		Functions\expect( 'add_settings_field' )->times( 12 )->andReturnFirstArg();
@@ -337,7 +337,7 @@ function test_main_section(): void {
 		$this->assertEquals( 12, $obj->main_section() );
 	}
 
-	function test_advanced_section(): void {
+	public function test_advanced_section(): void {
 		$obj = $this->AdminFactory();
 
 		Functions\expect( 'add_settings_field' )->times( 6 )->andReturnFirstArg();
@@ -345,7 +345,7 @@ function test_advanced_section(): void {
 		$this->assertEquals( 6, $obj->advanced_section() );
 	}
 
-	function test_rewrites_section(): void {
+	public function test_rewrites_section(): void {
 		$obj = $this->AdminFactory();
 
 		foreach ( array(
diff --git a/tests/phpunit/Admin/TestIcon.php b/tests/phpunit/Admin/TestIcon.php
index e9232895..ef202248 100644
--- a/tests/phpunit/Admin/TestIcon.php
+++ b/tests/phpunit/Admin/TestIcon.php
@@ -55,42 +55,42 @@ public static function get_post_type(): array {
 		);
 	}
 
-	public function test_get_a_not_empty_post(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[0];
-
-		Functions\expect( 'get_edit_post_link' )->once()->andReturn( $edit_link );
-
-		$post = $this->get_post( $post_type, 2 );
-		$obj  = $this->IconFactory( $post );
-
-		$value = '<a title="Edit the translation in the de_DE-blog" href="' . $edit_link . '"><span class="dashicons dashicons-edit"></span></a>&nbsp;';
-		$this->assertEquals( $value, $obj->get_a() );
-		$this->assertEquals( $value, $obj->__toString() );
+	/**
+	 * Columns: index in get_post_type(), add_query_arg() calls. Only pages get a post_type query arg.
+	 *
+	 * @return array<string, array{int, int}>
+	 */
+	public static function post_type_provider(): array {
+		return array(
+			'post' => array( 0, 0 ),
+			'page' => array( 1, 2 ),
+		);
 	}
 
-	public function test_get_a_not_empty_page(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[1];
+	#[DataProvider( 'post_type_provider' )]
+	public function test_get_a_not_empty( int $index, int $add_query_arg_calls ): void {
+		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[ $index ];
 
-		Functions\expect( 'add_query_arg' )->twice()->andReturn( $edit_link );
+		Functions\expect( 'add_query_arg' )->times( $add_query_arg_calls )->andReturn( $edit_link );
 		Functions\expect( 'get_edit_post_link' )->once()->andReturn( $edit_link );
 
-		$post = $this->get_post( $post_type, 2 );
-		$obj  = $this->IconFactory( $post );
+		$obj = $this->IconFactory( $this->get_post( $post_type, 2 ) );
 
 		$value = '<a title="Edit the translation in the de_DE-blog" href="' . $edit_link . '"><span class="dashicons dashicons-edit"></span></a>&nbsp;';
 		$this->assertEquals( $value, $obj->get_a() );
 		$this->assertEquals( $value, $obj->__toString() );
 	}
 
-	public function test_get_a_empty_post(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[0];
+	#[DataProvider( 'post_type_provider' )]
+	public function test_get_a_empty( int $index, int $add_query_arg_calls ): void {
+		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[ $index ];
 
 		Functions\expect( 'get_current_blog_id' )->twice()->andReturn( 1 );
 		Functions\expect( 'get_admin_url' )->twice()->andReturn( $create_link );
+		Functions\expect( 'add_query_arg' )->times( $add_query_arg_calls )->andReturn( $create_link );
 		Functions\expect( 'get_edit_post_link' )->twice()->andReturn( null );
 
-		$post = $this->get_post( $post_type );
-		$obj  = $this->IconFactory( $post );
+		$obj = $this->IconFactory( $this->get_post( $post_type ) );
 
 		$this->assertInstanceOf( Icon::class, $obj->set_href( 0 ) );
 
@@ -102,55 +102,19 @@ public function test_get_a_empty_post(): void {
 		$this->assertEquals( $value, $obj->__toString() );
 	}
 
-	public function test_get_a_empty_page(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[1];
+	#[DataProvider( 'post_type_provider' )]
+	public function test_get_img( int $index, int $add_query_arg_calls ): void {
+		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[ $index ];
 
-		Functions\expect( 'get_current_blog_id' )->twice()->andReturn( 1 );
-		Functions\expect( 'get_admin_url' )->twice()->andReturn( $create_link );
-		Functions\expect( 'add_query_arg' )->twice()->andReturn( $create_link );
-		Functions\expect( 'get_edit_post_link' )->twice()->andReturn( null );
-
-		$post = $this->get_post( $post_type );
-		$obj  = $this->IconFactory( $post );
-
-		$this->assertInstanceOf( Icon::class, $obj->set_href( 0 ) );
-
-		$value = sprintf(
-			'<a title="Create a new translation in the de_DE-blog" href="%s"><span class="dashicons dashicons-plus"></span></a>&nbsp;',
-			$create_link
-		);
-		$this->assertEquals( $value, $obj->get_a() );
-		$this->assertEquals( $value, $obj->__toString() );
-	}
-
-	public function test_get_img_post(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[0];
-
-		Functions\expect( 'get_current_blog_id' )->once()->andReturn( 1 );
-		Functions\expect( 'get_admin_url' )->once()->andReturn( $this->admin_url );
-		Functions\expect( 'get_edit_post_link' )->once()->andReturn( $edit_link );
-
-		$post = $this->get_post( $post_type );
-		$obj  = $this->IconFactory( $post );
-
-		$this->assertEquals( '<img alt="de_DE" src="' . $this->src . '" />', $obj->get_img() );
-		$this->assertIsSTring( $obj->get_edit_new() );
-	}
-
-
-	public function test_get_img_post_page(): void {
-		list ( $post_type, $create_link, $edit_link ) = $this->get_post_type()[1];
-
-		Functions\expect( 'add_query_arg' )->twice()->andReturn( $edit_link );
+		Functions\expect( 'add_query_arg' )->times( $add_query_arg_calls )->andReturn( $edit_link );
 		Functions\expect( 'get_current_blog_id' )->once()->andReturn( 1 );
 		Functions\expect( 'get_admin_url' )->once()->andReturn( $this->admin_url );
 		Functions\expect( 'get_edit_post_link' )->once()->andReturn( $edit_link );
 
-		$post = $this->get_post( $post_type );
-		$obj  = $this->IconFactory( $post );
+		$obj = $this->IconFactory( $this->get_post( $post_type ) );
 
 		$this->assertEquals( '<img alt="de_DE" src="' . $this->src . '" />', $obj->get_img() );
-		$this->assertIsSTring( $obj->get_edit_new() );
+		$this->assertSame( $this->admin_url, $obj->get_edit_new() );
 	}
 
 	public function test_set_id_with_null_constructor(): void {
@@ -206,19 +170,6 @@ public function test_get_icon( string $icon_type, ?string $language, string $exp
 		$this->assertEquals( $expected, $obj->get_icon() );
 	}
 
-	public function test_get_icon_label(): void {
-		Functions\expect( 'plugin_dir_path' )->atLeast( 1 )->andReturn( dirname( __DIR__, 3 ) . '/' );
-
-		$obj = new Icon( 'post' );
-		$obj->set_icon_type( 'flag' );
-
-		$this->assertEquals( '', $obj->get_icon() );
-
-		$obj->set_language( 'de_DE' );
-
-		$this->assertEquals( '<span class="flag-icon flag-icon-de">de_DE</span>', $obj->get_icon() );
-	}
-
 	public function test_get_edit_new(): void {
 		$obj = new Icon( 'post' );
 		$obj->set_id( 123 );
diff --git a/tests/phpunit/Admin/TestMetaBox.php b/tests/phpunit/Admin/TestMetaBox.php
index 74d06bda..9acaec99 100644
--- a/tests/phpunit/Admin/TestMetaBox.php
+++ b/tests/phpunit/Admin/TestMetaBox.php
@@ -128,22 +128,22 @@ public function test_get_suggested_fields_no_posts(): void {
 		$this->assertEquals( $json, MetaBox::get_suggested_fields( $json, $args ) );
 	}
 
-	public function test_render_option_selected(): void {
-		Functions\expect( 'selected' )->once()->andReturn( 'selected="selected"' );
-		Functions\expect( 'get_the_title' )->once()->andReturn( 'Test' );
-
-		$test = $this->MetaBoxFactory();
-
-		$this->assertEquals( '<option value="1" selected="selected">Test</option>', $test->render_option( 1, 1 ) );
+	/**
+	 * @return array<string, array{int, string, string}>
+	 */
+	public static function render_option_provider(): array {
+		return array(
+			'selected'     => array( 1, 'selected="selected"', '<option value="1" selected="selected">Test</option>' ),
+			'not selected' => array( 2, '', '<option value="1" >Test</option>' ),
+		);
 	}
 
-	public function test_render_option_not_selected(): void {
-		Functions\expect( 'selected' )->once()->andReturn( '' );
+	#[DataProvider( 'render_option_provider' )]
+	public function test_render_option( int $current, string $selected, string $expected ): void {
+		Functions\expect( 'selected' )->once()->andReturn( $selected );
 		Functions\expect( 'get_the_title' )->once()->andReturn( 'Test' );
 
-		$test = $this->MetaBoxFactory();
-
-		$this->assertEquals( '<option value="1" >Test</option>', $test->render_option( 1, 2 ) );
+		$this->assertEquals( $expected, $this->MetaBoxFactory()->render_option( 1, $current ) );
 	}
 
 	public function test_render_options(): void {
@@ -367,13 +367,23 @@ public function test_set_with_request(): void {
 		$this->MetaBoxFactory()->set( 13 );
 	}
 
-	public function test_maybe_set_linked_post() {
-		$post = \Mockery::mock( 'WP_Post' );
-
+	/**
+	 * Expects a request asking to link the post 42 in de_DE. The id is only read when nothing is linked yet.
+	 */
+	private function expect_linked_post_request( bool $reads_id ): void {
 		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID )->andReturnTrue();
 		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG )->andReturnTrue();
 		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( 'de_DE' );
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID, FILTER_SANITIZE_NUMBER_INT )->andReturn( 42 );
+
+		if ( $reads_id ) {
+			Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID, FILTER_SANITIZE_NUMBER_INT )->andReturn( 42 );
+		}
+	}
+
+	public function test_maybe_set_linked_post() {
+		$post = \Mockery::mock( 'WP_Post' );
+
+		$this->expect_linked_post_request( true );
 		Functions\expect( 'get_post' )->once()->andReturn( $post );
 		Functions\expect( 'restore_current_blog' )->once();
 		Functions\expect( 'switch_to_blog' )->once();
@@ -388,10 +398,7 @@ public function test_maybe_set_linked_post() {
 	}
 
 	public function test_maybe_set_linked_post_with_no_post() {
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID )->andReturnTrue();
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG )->andReturnTrue();
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( 'de_DE' );
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID, FILTER_SANITIZE_NUMBER_INT )->andReturn( 42 );
+		$this->expect_linked_post_request( true );
 		Functions\expect( 'get_post' )->once()->andReturn( null );
 		Functions\expect( 'restore_current_blog' )->once();
 		Functions\expect( 'switch_to_blog' )->once();
@@ -405,7 +412,7 @@ public function test_maybe_set_linked_post_with_no_post() {
 		$this->assertNull( $mydata->de_DE );
 	}
 
-	function test_maybe_set_linked_post_with_no_blog_id() {
+	public function test_maybe_set_linked_post_with_no_blog_id() {
 		$options = \Mockery::mock( Options::class );
 
 		$collection = \Mockery::mock( Collection::class );
@@ -413,10 +420,7 @@ function test_maybe_set_linked_post_with_no_blog_id() {
 
 		$test = new MetaBox( $options, $collection );
 
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID )->andReturnTrue();
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG )->andReturnTrue();
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( 'de_DE' );
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID, FILTER_SANITIZE_NUMBER_INT )->andReturn( 42 );
+		$this->expect_linked_post_request( true );
 		Functions\expect( 'get_option' )->once()->andReturn( array() );
 
 		$mydata = new Post();
@@ -425,16 +429,14 @@ function test_maybe_set_linked_post_with_no_blog_id() {
 		$this->assertNull( $mydata->de_DE );
 	}
 
-	function test_maybe_set_linked_post_with_mydata_already_set() {
+	public function test_maybe_set_linked_post_with_mydata_already_set() {
 		$options = \Mockery::mock( Options::class );
 
 		$collection = \Mockery::mock( Collection::class );
 
 		$test = new MetaBox( $options, $collection );
 
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_ID )->andReturnTrue();
-		Functions\expect( 'filter_has_var' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG )->andReturnTrue();
-		Functions\expect( 'filter_input' )->once()->with( INPUT_GET, Fields::FIELD_MSLS_LANG, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( 'de_DE' );
+		$this->expect_linked_post_request( false );
 		Functions\expect( 'get_option' )->once()->andReturn( array() );
 
 		$mydata        = new Post();
diff --git a/tests/phpunit/Blog/TestCollection.php b/tests/phpunit/Blog/TestCollection.php
index 017667de..282d9a43 100644
--- a/tests/phpunit/Blog/TestCollection.php
+++ b/tests/phpunit/Blog/TestCollection.php
@@ -149,22 +149,6 @@ public function test_get_blogs_of_reference_user_empty_fallback_is_safe(): void
 		$this->assertSame( 0, $this->captured_user_id );
 	}
 
-	public function test_get_current_blog_id(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsInt( $obj->get_current_blog_id() );
-	}
-
-	public function test_has_current_blog(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsBool( $obj->has_current_blog() );
-	}
-
 	public function test_is_current_blog_true(): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
 
@@ -187,14 +171,6 @@ public function test_is_current_blog_false(): void {
 		$this->assertFalse( $obj->is_current_blog( $blog ) );
 	}
 
-	public function test_get_objects(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsArray( $obj->get_objects() );
-	}
-
 	public function test_get_object(): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
 
@@ -234,46 +210,40 @@ public function test_is_plugin_active( int $blog_id, bool $expected ): void {
 		$this->assertSame( $expected, $obj->is_plugin_active( $blog_id ) );
 	}
 
-	public function test_get_plugin_active_blogs(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsArray( $obj->get_plugin_active_blogs() );
-	}
-
-	public function test_get(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsArray( $obj->get() );
-	}
-
-	public function test_get_filtered(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsArray( $obj->get_filtered() );
-		$this->assertIsArray( $obj->get_filtered( true ) );
-	}
-
-	public function test_get_users_single(): void {
-		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-
-		$obj = new Collection();
-
-		$this->assertIsArray( $obj->get_users( array( 'ID' ), 1 ) );
+	/**
+	 * Blog 1 is the current one, blog 3 has the plugin deactivated.
+	 *
+	 * @return array<string, array{string, array<int, mixed>, int|bool|int[]}>
+	 */
+	public static function getter_provider(): array {
+		return array(
+			'current blog id'          => array( 'get_current_blog_id', array(), 1 ),
+			'has the current blog'     => array( 'has_current_blog', array(), true ),
+			'objects'                  => array( 'get_objects', array(), array( 1, 2 ) ),
+			'plugin active blogs'      => array( 'get_plugin_active_blogs', array(), array( 1, 2 ) ),
+			'all but the current blog' => array( 'get', array(), array( 2 ) ),
+			'filtered'                 => array( 'get_filtered', array(), array( 2 ) ),
+			'filtered explicitly'      => array( 'get_filtered', array( true ), array( 2 ) ),
+			'single user'              => array( 'get_users', array( array( 'ID' ), 1 ), array() ),
+			'massive users'            => array( 'get_users', array( array( 'ID' ), self::TOTAL_USERS ), array() ),
+		);
 	}
 
-	public function test_get_users_massive(): void {
+	/**
+	 * @param array<int, mixed> $args
+	 * @param int|bool|int[]    $expected
+	 */
+	#[DataProvider( 'getter_provider' )]
+	public function test_getters( string $method, array $args, $expected ): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
-		Functions\expect( 'count_users' )->never();
 
-		$obj = new Collection();
+		$result = ( new Collection() )->$method( ...$args );
+		if ( is_array( $result ) ) {
+			// Blog objects are compared by their id.
+			$result = array_values( array_map( fn( $blog ) => $blog->userblog_id, $result ) );
+		}
 
-		$this->assertIsArray( $obj->get_users( array( 'ID' ), self::TOTAL_USERS ) );
+		$this->assertSame( $expected, $result );
 	}
 
 	public function test_get_current_blog(): void {
diff --git a/tests/phpunit/Db/TestSqlCacher.php b/tests/phpunit/Db/TestSqlCacher.php
index 6f23bc77..73b04b6c 100644
--- a/tests/phpunit/Db/TestSqlCacher.php
+++ b/tests/phpunit/Db/TestSqlCacher.php
@@ -38,7 +38,7 @@ public function test_set_params_method(): void {
 			$test->siteid
 		);
 
-		$this->assertIsSTring( $sql );
+		$this->assertIsString( $sql );
 		$this->assertIsArray( $test->get_results( $sql ) );
 	}
 }
diff --git a/tests/phpunit/Frontend/TestPagination.php b/tests/phpunit/Frontend/TestPagination.php
index 45334cbd..9e84bc02 100644
--- a/tests/phpunit/Frontend/TestPagination.php
+++ b/tests/phpunit/Frontend/TestPagination.php
@@ -85,94 +85,32 @@ public function test_is_active_can_be_switched_off(): void {
 		$this->assertFalse( ( new Pagination( 3 ) )->is_active() );
 	}
 
-	public function test_get_returns_an_empty_url_untouched(): void {
-		$this->assertEquals( '', ( new Pagination( 3 ) )->get( '', $this->optionsWithPages( 5 ), 'it_IT' ) );
-	}
-
-	public function test_get_leaves_an_unpaginated_request_alone(): void {
-		$url = 'https://example.com/main-dishes/';
-
-		$this->assertEquals( $url, ( new Pagination( 0 ) )->get( $url, $this->optionsWithPages( 5 ), 'it_IT' ) );
-	}
-
-	public function test_get_adds_the_page_of_an_archive(): void {
-		Functions\expect( 'get_option' )->twice()->andReturn( '/%postname%/' );
-
-		$test = new Pagination( 3 );
-
-		$this->assertEquals(
-			'https://example.com/main-dishes/page/3/',
-			$test->get( 'https://example.com/main-dishes/', $this->optionsWithPages( 5 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_falls_back_to_the_first_page_when_the_blog_is_shorter(): void {
-		$url = 'https://example.com/main-dishes/';
-
-		$this->assertEquals( $url, ( new Pagination( 3 ) )->get( $url, $this->optionsWithPages( 2 ), 'it_IT' ) );
-	}
-
-	public function test_get_uses_the_query_string_without_pretty_permalinks(): void {
-		Functions\expect( 'get_option' )->once()->andReturn( '' );
-
-		$this->assertEquals(
-			'https://example.com/?cat=7&paged=3',
-			( new Pagination( 3 ) )->get( 'https://example.com/?cat=7', $this->optionsWithPages( 5 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_keeps_a_query_string_behind_the_page(): void {
-		Functions\expect( 'get_option' )->twice()->andReturn( '/%postname%/' );
-
-		$this->assertEquals(
-			'https://example.com/main-dishes/page/3/?orderby=title',
-			( new Pagination( 3 ) )->get( 'https://example.com/main-dishes/?orderby=title', $this->optionsWithPages( 5 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_uses_the_query_string_for_an_unrewritten_post_type(): void {
-		Functions\expect( 'get_option' )->once()->andReturn( '/%postname%/' );
-
-		$this->assertEquals(
-			'https://example.com/?post_type=book&paged=3',
-			( new Pagination( 3 ) )->get( 'https://example.com/?post_type=book', $this->optionsWithPages( 5 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_uses_the_query_string_for_a_post_without_a_pretty_link(): void {
-		Functions\expect( 'get_option' )->once()->andReturn( '/%postname%/' );
-
-		$this->assertEquals(
-			'https://example.com/?p=123&page=2',
-			( new Pagination( 0, 2 ) )->get( 'https://example.com/?p=123', $this->optionsWithPages( 4 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_drops_the_trailing_slash_of_the_target_blog(): void {
-		Functions\expect( 'get_option' )->twice()->andReturn( '/%postname%' );
-
-		$this->assertEquals(
-			'https://example.com/main-dishes/page/3',
-			( new Pagination( 3 ) )->get( 'https://example.com/main-dishes/', $this->optionsWithPages( 5 ), 'it_IT' )
-		);
-	}
-
-	public function test_get_adds_the_page_of_a_post(): void {
-		Functions\expect( 'get_option' )->twice()->andReturn( '/%postname%/' );
-
-		$this->assertEquals(
-			'https://example.com/my-post/2/',
-			( new Pagination( 0, 2 ) )->get( 'https://example.com/my-post/', $this->optionsWithPages( 4 ), 'it_IT' )
+	/**
+	 * Columns: paged, page, url, max pages of the target blog, get_option() calls, permalink structure, expected url.
+	 *
+	 * @return array<string, array{int, int, string, int, int, string, string}>
+	 */
+	public static function get_provider(): array {
+		return array(
+			'returns an empty url untouched'              => array( 3, 0, '', 5, 0, '', '' ),
+			'leaves an unpaginated request alone'         => array( 0, 0, 'https://example.com/main-dishes/', 5, 0, '', 'https://example.com/main-dishes/' ),
+			'adds the page of an archive'                 => array( 3, 0, 'https://example.com/main-dishes/', 5, 2, '/%postname%/', 'https://example.com/main-dishes/page/3/' ),
+			'falls back to the first page when the blog is shorter' => array( 3, 0, 'https://example.com/main-dishes/', 2, 0, '', 'https://example.com/main-dishes/' ),
+			'uses the query string without pretty permalinks' => array( 3, 0, 'https://example.com/?cat=7', 5, 1, '', 'https://example.com/?cat=7&paged=3' ),
+			'keeps a query string behind the page'        => array( 3, 0, 'https://example.com/main-dishes/?orderby=title', 5, 2, '/%postname%/', 'https://example.com/main-dishes/page/3/?orderby=title' ),
+			'uses the query string for an unrewritten post type' => array( 3, 0, 'https://example.com/?post_type=book', 5, 1, '/%postname%/', 'https://example.com/?post_type=book&paged=3' ),
+			'uses the query string for a post without a pretty link' => array( 0, 2, 'https://example.com/?p=123', 4, 1, '/%postname%/', 'https://example.com/?p=123&page=2' ),
+			'drops the trailing slash of the target blog' => array( 3, 0, 'https://example.com/main-dishes/', 5, 2, '/%postname%', 'https://example.com/main-dishes/page/3' ),
+			'adds the page of a post'                     => array( 0, 2, 'https://example.com/my-post/', 4, 2, '/%postname%/', 'https://example.com/my-post/2/' ),
+			'uses the pagination base for a static front page' => array( 0, 2, 'https://example.com/', 4, 2, '/%postname%/', 'https://example.com/page/2/' ),
 		);
 	}
 
-	public function test_get_uses_the_pagination_base_for_a_static_front_page(): void {
-		Functions\expect( 'get_option' )->twice()->andReturn( '/%postname%/' );
+	#[DataProvider( 'get_provider' )]
+	public function test_get( int $paged, int $page, string $url, int $max_pages, int $get_option_calls, string $permalink_structure, string $expected ): void {
+		Functions\expect( 'get_option' )->times( $get_option_calls )->andReturn( $permalink_structure );
 
-		$this->assertEquals(
-			'https://example.com/page/2/',
-			( new Pagination( 0, 2 ) )->get( 'https://example.com/', $this->optionsWithPages( 4 ), 'it_IT' )
-		);
+		$this->assertEquals( $expected, ( new Pagination( $paged, $page ) )->get( $url, $this->optionsWithPages( $max_pages ), 'it_IT' ) );
 	}
 
 	public function test_get_respects_a_corrected_number_of_pages(): void {
diff --git a/tests/phpunit/Link/TestImageOnly.php b/tests/phpunit/Link/TestImageOnly.php
index 47f0c5d2..8bc174e9 100644
--- a/tests/phpunit/Link/TestImageOnly.php
+++ b/tests/phpunit/Link/TestImageOnly.php
@@ -8,6 +8,6 @@
 final class TestImageOnly extends MslsUnitTestCase {
 
 	public function test_get_description_method(): void {
-		$this->assertIsSTring( ImageOnly::get_description() );
+		$this->assertIsString( ImageOnly::get_description() );
 	}
 }
diff --git a/tests/phpunit/Link/TestTextImage.php b/tests/phpunit/Link/TestTextImage.php
index 0ad78f23..805bd7f5 100644
--- a/tests/phpunit/Link/TestTextImage.php
+++ b/tests/phpunit/Link/TestTextImage.php
@@ -8,6 +8,6 @@
 final class TestTextImage extends MslsUnitTestCase {
 
 	public function test_get_description_method(): void {
-		$this->assertIsSTring( TextImage::get_description() );
+		$this->assertIsString( TextImage::get_description() );
 	}
 }
diff --git a/tests/phpunit/Link/TestTextOnly.php b/tests/phpunit/Link/TestTextOnly.php
index 557962a6..6020c2db 100644
--- a/tests/phpunit/Link/TestTextOnly.php
+++ b/tests/phpunit/Link/TestTextOnly.php
@@ -8,6 +8,6 @@
 final class TestTextOnly extends MslsUnitTestCase {
 
 	public function test_get_description_method(): void {
-		$this->assertIsSTring( TextOnly::get_description() );
+		$this->assertIsString( TextOnly::get_description() );
 	}
 }
diff --git a/tests/phpunit/Options/Post/TestPost.php b/tests/phpunit/Options/Post/TestPost.php
index 9a286e4f..bf5d2386 100644
--- a/tests/phpunit/Options/Post/TestPost.php
+++ b/tests/phpunit/Options/Post/TestPost.php
@@ -6,6 +6,7 @@
 use Brain\Monkey\Functions;
 use lloc\Msls\Options\Post\Post;
 use lloc\MslsTests\MslsUnitTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 use function Brain\Monkey\Filters;
 use function Brain\Monkey\Functions;
@@ -99,29 +100,30 @@ public function test_get_max_pages_of_a_single_post_request(): void {
 		$this->assertEquals( 0, $test->get_max_pages( 'de_DE', Post::PAGINATION_ARCHIVE ) );
 	}
 
-	public function test_get_postlink_not_has_value(): void {
-		$test = $this->OptionsPostFactory();
-
-		$this->assertEquals( '', $test->get_postlink( 'es_ES' ) );
-	}
-
-	public function test_get_postlink_post_is_null(): void {
-		Functions\expect( 'get_post' )->once()->andReturnNull();
-
-		$test = $this->OptionsPostFactory();
-
-		$this->assertEquals( '', $test->get_postlink( 'de_DE' ) );
+	/**
+	 * Columns: language, get_post() calls, status of the returned post (null returns no post).
+	 *
+	 * @return array<string, array{string, int, ?string}>
+	 */
+	public static function empty_postlink_provider(): array {
+		return array(
+			'no translation'  => array( 'es_ES', 0, null ),
+			'post not found'  => array( 'de_DE', 1, null ),
+			'post is a draft' => array( 'de_DE', 1, 'draft' ),
+		);
 	}
 
-	public function test_get_postlink_post_is_draft(): void {
-		$post              = \Mockery::mock( '\WP_Post' );
-		$post->post_status = 'draft';
-
-		Functions\expect( 'get_post' )->once()->andReturn( $post );
+	#[DataProvider( 'empty_postlink_provider' )]
+	public function test_get_postlink_is_empty( string $language, int $get_post_calls, ?string $post_status ): void {
+		$post = null;
+		if ( null !== $post_status ) {
+			$post              = \Mockery::mock( '\WP_Post' );
+			$post->post_status = $post_status;
+		}
 
-		$test = $this->OptionsPostFactory();
+		Functions\expect( 'get_post' )->times( $get_post_calls )->andReturn( $post );
 
-		$this->assertEquals( '', $test->get_postlink( 'de_DE' ) );
+		$this->assertEquals( '', $this->OptionsPostFactory()->get_postlink( $language ) );
 	}
 
 	public function test_get_postlink_post_is_published(): void {
diff --git a/tests/phpunit/Options/Tax/TestCategory.php b/tests/phpunit/Options/Tax/TestCategory.php
index 2a33dc96..588ce495 100644
--- a/tests/phpunit/Options/Tax/TestCategory.php
+++ b/tests/phpunit/Options/Tax/TestCategory.php
@@ -15,6 +15,6 @@ public function test_object(): void {
 
 		$obj = new Category( 0 );
 
-		$this->assertIsSTring( $obj->get_postlink( '' ) );
+		$this->assertIsString( $obj->get_postlink( '' ) );
 	}
 }
diff --git a/tests/phpunit/Options/Tax/TestTax.php b/tests/phpunit/Options/Tax/TestTax.php
index 0ccf6dfa..c92bd068 100644
--- a/tests/phpunit/Options/Tax/TestTax.php
+++ b/tests/phpunit/Options/Tax/TestTax.php
@@ -212,7 +212,7 @@ public function test_get_postlink_empty(): void {
 	public function test_get_current_link(): void {
 		$test = $this->OptionsTaxFactory();
 
-		$this->assertIsString( $test->get_current_link() );
+		$this->assertSame( '', $test->get_current_link() );
 	}
 
 	public function test_get_term_link(): void {
diff --git a/tests/phpunit/Options/TestOptions.php b/tests/phpunit/Options/TestOptions.php
index 84c60d06..358c11d6 100644
--- a/tests/phpunit/Options/TestOptions.php
+++ b/tests/phpunit/Options/TestOptions.php
@@ -135,7 +135,7 @@ public function test_get_arg(): void {
 		$obj = $this->MslsOptionsFactory();
 
 		$this->assertNull( $obj->get_arg( 0 ) );
-		$this->assertIsSTring( $obj->get_arg( 0, '' ) );
+		$this->assertIsString( $obj->get_arg( 0, '' ) );
 		$this->assertIsFloat( $obj->get_arg( 0, 1.1 ) );
 		$this->assertIsArray( $obj->get_arg( 0, array() ) );
 	}
@@ -178,68 +178,49 @@ public static function set_provider(): array {
 	}
 
 	#[DataProvider( 'set_provider' )]
-	function test_set( $expected, $input ): void {
+	public function test_set( $expected, $input ): void {
 		$obj = $this->MslsOptionsFactory();
 
 		$this->assertEquals( $expected, $obj->set( $input ) );
 	}
 
-	function test_get_permalink(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsSTring( $obj->get_permalink( 'de_DE' ) );
-	}
-
-	function test_get_postlink(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsSTring( $obj->get_postlink( 'de_DE' ) );
-		$this->assertEquals( '', $obj->get_postlink( 'de_DE' ) );
-	}
-
-	function test_get_current_link(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsSTring( $obj->get_current_link() );
-	}
-
-	function test_is_excluded(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsBool( $obj->is_excluded() );
-	}
-
-	function test_is_content_filter(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsBool( $obj->is_content_filter() );
-	}
-
-	function test_get_order(): void {
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsSTring( $obj->get_order() );
+	/**
+	 * @return array<string, array{string, array<int, string>, string|bool}>
+	 */
+	public static function getter_provider(): array {
+		return array(
+			'permalink falls back to the home url' => array( 'get_permalink', array( 'de_DE' ), 'https://lloc.de' ),
+			'postlink is empty'                    => array( 'get_postlink', array( 'de_DE' ), '' ),
+			'current link is the home url'         => array( 'get_current_link', array(), 'https://lloc.de' ),
+			'not excluded'                         => array( 'is_excluded', array(), false ),
+			'no content filter'                    => array( 'is_content_filter', array(), false ),
+			'ordered by language'                  => array( 'get_order', array(), 'language' ),
+			'url of the plugin'                    => array( 'get_url', array( '/dev/test' ), 'https://msls.co/wp-content/plugins' ),
+		);
 	}
 
-	function test_get_url(): void {
+	/**
+	 * @param array<int, string> $args
+	 * @param string|bool        $expected
+	 */
+	#[DataProvider( 'getter_provider' )]
+	public function test_getters( string $method, array $args, $expected ): void {
 		Functions\when( 'plugins_url' )->justReturn( 'https://msls.co/wp-content/plugins' );
 
-		$obj = $this->MslsOptionsFactory();
-
-		$this->assertIsSTring( $obj->get_url( '/dev/test' ) );
+		$this->assertSame( $expected, $this->MslsOptionsFactory()->$method( ...$args ) );
 	}
 
-	function test_get_flag_url(): void {
+	public function test_get_flag_url(): void {
 		Functions\when( 'is_admin' )->justReturn( true );
 		Functions\when( 'plugins_url' )->justReturn( 'https://msls.co/wp-content/plugins' );
 		Functions\when( 'plugin_dir_path' )->justReturn( dirname( __DIR__, 2 ) . '/' );
 
 		$obj = $this->MslsOptionsFactory();
 
-		$this->assertIsSTring( $obj->get_flag_url( 'de_DE' ) );
+		$this->assertIsString( $obj->get_flag_url( 'de_DE' ) );
 	}
 
-	function test_get_available_languages(): void {
+	public function test_get_available_languages(): void {
 		Functions\expect( 'get_available_languages' )->once()->andReturn( array( 'de_DE', 'it_IT' ) );
 		Functions\expect( 'format_code_lang' )->atLeast()->once()->andReturnUsing(
 			function ( $code ) {
diff --git a/tests/phpunit/TestPlugin.php b/tests/phpunit/TestPlugin.php
index a8024f64..670012b6 100644
--- a/tests/phpunit/TestPlugin.php
+++ b/tests/phpunit/TestPlugin.php
@@ -10,7 +10,7 @@
 
 final class TestPlugin extends MslsUnitTestCase {
 
-	function test_admin_menu_without_autocomplete(): void {
+	public function test_admin_menu_without_autocomplete(): void {
 		Functions\expect( 'is_admin_bar_showing' )->once()->andReturnTrue();
 		Functions\expect( 'wp_enqueue_style' )->twice();
 		Functions\expect( 'plugins_url' )->twice()->andReturn( 'https://msls.co/wp-content/plugins' );
@@ -23,7 +23,7 @@ function test_admin_menu_without_autocomplete(): void {
 		$test->custom_enqueue();
 	}
 
-	function test_admin_menu_with_autocomplete(): void {
+	public function test_admin_menu_with_autocomplete(): void {
 		Functions\expect( 'is_admin_bar_showing' )->once()->andReturnTrue();
 		Functions\expect( 'wp_enqueue_style' )->twice();
 		Functions\expect( 'plugins_url' )->times( 3 )->andReturn( 'https://msls.co/wp-content/plugins' );
@@ -39,7 +39,7 @@ function test_admin_menu_with_autocomplete(): void {
 		$test->custom_enqueue();
 	}
 
-	function test_admin_menu_with_quick_create(): void {
+	public function test_admin_menu_with_quick_create(): void {
 		Functions\expect( 'is_admin_bar_showing' )->once()->andReturnTrue();
 		Functions\expect( 'wp_enqueue_style' )->twice();
 		Functions\expect( 'plugins_url' )->times( 3 )->andReturn( 'https://msls.co/wp-content/plugins' );
@@ -55,7 +55,7 @@ function test_admin_menu_with_quick_create(): void {
 		$test->custom_enqueue();
 	}
 
-	function test_admin_menu_admin_bar_not_showing(): void {
+	public function test_admin_menu_admin_bar_not_showing(): void {
 		Functions\expect( 'is_admin_bar_showing' )->once()->andReturnFalse();
 
 		$options = \Mockery::mock( Options::class );
@@ -71,7 +71,7 @@ function test_admin_menu_admin_bar_not_showing(): void {
 	/**
 	 * Verify the static message_handler-method
 	 */
-	function test_message_handler(): void {
+	public function test_message_handler(): void {
 		$this->expectOutputString( '<div id="msls-warning" class="error"><p>Test</p></div>' );
 
 		Plugin::message_handler( 'Test' );
@@ -84,7 +84,7 @@ public function test_dirname(): void {
 	/**
 	 * Verify the static uninstall-method
 	 */
-	function test_uninstall(): void {
+	public function test_uninstall(): void {
 		Functions\expect( 'delete_option' )->times( 3 )->andReturn( false );
 		Functions\expect( 'is_multisite' )->once()->andReturn( true );