diff --git a/includes/class-mention.php b/includes/class-mention.php
index f3cc168..022b033 100644
--- a/includes/class-mention.php
+++ b/includes/class-mention.php
@@ -46,7 +46,7 @@ class Mention {
 			return \sprintf( '<a rel="mention" class="u-url mention href="%s">%s</a>', $metadata['url'], $username );
 		}
 
-		return $username;
+		return $result[0];
 	}
 
 	public static function extract_mentions( $mentions, \ActivityPub\Model\Post $post ) {
diff --git a/includes/rest/class-webfinger.php b/includes/rest/class-webfinger.php
index e2c5325..9115bcb 100644
--- a/includes/rest/class-webfinger.php
+++ b/includes/rest/class-webfinger.php
@@ -126,8 +126,6 @@ class Webfinger {
 
 		$url = \add_query_arg( 'resource', 'acct:' . ltrim( $account, '@' ), 'https://' . $m[1] . '/.well-known/webfinger' );
 		if ( ! \wp_http_validate_url( $url ) ) {
-			echo $url;
-			exit;
 			return new \WP_Error( 'invalid_webfinger_url', null, $url );
 		}
 
diff --git a/tests/test-functions.php b/tests/test-functions.php
index b62669c..68140e0 100644
--- a/tests/test-functions.php
+++ b/tests/test-functions.php
@@ -2,6 +2,8 @@
 class Test_Functions extends ActivityPub_TestCase_Cache_HTTP {
 	public function test_get_remote_metadata_by_actor() {
 		$metadata = \ActivityPub\get_remote_metadata_by_actor( 'pfefferle@notiz.blog' );
-		$this->assertArrayHasKey( 'url', $metadata );
+		$this->assertEquals( 'https://notiz.blog/author/matthias-pfefferle/', $metadata['url'] );
+		$this->assertEquals( 'pfefferle', $metadata['preferredUsername'] );
+		$this->assertEquals( 'Matthias Pfefferle', $metadata['name'] );
 	}
 }