diff --git a/autotests/data/music/testMany.ogg b/autotests/data/music/testMany.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/data/music/testMultiple.ogg b/autotests/data/music/testMultiple.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/filescannertest.cpp b/autotests/filescannertest.cpp
--- a/autotests/filescannertest.cpp
+++ b/autotests/filescannertest.cpp
@@ -24,6 +24,7 @@
 #include <QUrl>
 #include <QDateTime>
 #include <QTime>
+#include <QMimeDatabase>
 
 #include <QDebug>
 
@@ -64,6 +65,17 @@
 
     }
 
+    void testFileMetaDataScan()
+    {
+        QMimeDatabase mimeDb;
+        FileScanner fileScanner;
+        auto scannedTrack = fileScanner.scanOneFile(QUrl::fromLocalFile(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/test.ogg")), mimeDb);
+        QCOMPARE(scannedTrack.title(), QStringLiteral("Title"));
+        QCOMPARE(scannedTrack.genre(), QStringLiteral("Genre"));
+        QCOMPARE(scannedTrack.albumName(), QStringLiteral("Test"));
+        QCOMPARE(scannedTrack.artist(), QStringLiteral("Artist"));
+    }
+
     void testFindCoverInDirectory()
     {
         FileScanner fileScanner;
@@ -86,6 +98,19 @@
         QVERIFY(fileScanner.checkEmbeddedCoverImage(mTestTracksForMetaData.at(2)));
     }
 
+    void benchmarkFileScan()
+    {
+        QMimeDatabase mimeDb;
+        FileScanner fileScanner;
+        QBENCHMARK {
+            for (int i = 0; i < 100; i++) {
+                auto scannedTrack = fileScanner.scanOneFile(QUrl::fromLocalFile(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/test.ogg")), mimeDb);
+                auto scannedTrack2 = fileScanner.scanOneFile(QUrl::fromLocalFile(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/testMultiple.ogg")), mimeDb);
+                auto scannedTrack3 = fileScanner.scanOneFile(QUrl::fromLocalFile(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/testMany.ogg")), mimeDb);
+            }
+        }
+    }
+
     void benchmarkCoverInDirectory()
     {
         FileScanner fileScanner;
diff --git a/autotests/localfilelistingtest.cpp b/autotests/localfilelistingtest.cpp
--- a/autotests/localfilelistingtest.cpp
+++ b/autotests/localfilelistingtest.cpp
@@ -127,8 +127,8 @@
         auto secondNewTracks = secondNewTracksSignal.at(0).value<QList<MusicAudioTrack>>();
         auto newCovers = secondNewTracksSignal.at(1).value<QHash<QString, QUrl>>();
 
-        QCOMPARE(firstNewTracks.count() + secondNewTracks.count(), 3);
-        QCOMPARE(newCovers.count(), 3);
+        QCOMPARE(firstNewTracks.count() + secondNewTracks.count(), 5);
+        QCOMPARE(newCovers.count(), 5);
     }
 
     void addAndRemoveTracks()