diff --git a/tests/overallflac.cpp b/tests/overallflac.cpp
index 4265f71..1774960 100644
--- a/tests/overallflac.cpp
+++ b/tests/overallflac.cpp
@@ -41,7 +41,7 @@ void OverallTests::checkFlacTestfile1()
         checkOggTestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
@@ -71,7 +71,7 @@ void OverallTests::checkFlacTestfile2()
         checkOggTestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
diff --git a/tests/overallmp4.cpp b/tests/overallmp4.cpp
index 94489e4..4d9f926 100644
--- a/tests/overallmp4.cpp
+++ b/tests/overallmp4.cpp
@@ -147,13 +147,13 @@ void OverallTests::checkMp4Testfile3()
     const auto tags = m_fileInfo.tags();
     switch(m_tagStatus) {
     case TagStatus::Original:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
         break;
     case TagStatus::TestMetaDataPresent:
         checkMp4TestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
@@ -235,13 +235,13 @@ void OverallTests::checkMp4Testfile5()
     const auto tags = m_fileInfo.tags();
     switch(m_tagStatus) {
     case TagStatus::Original:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
         break;
     case TagStatus::TestMetaDataPresent:
         checkMp4TestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
diff --git a/tests/overallogg.cpp b/tests/overallogg.cpp
index 3df7f2d..56f2a6a 100644
--- a/tests/overallogg.cpp
+++ b/tests/overallogg.cpp
@@ -42,7 +42,7 @@ void OverallTests::checkOggTestfile1()
         checkOggTestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
@@ -77,7 +77,7 @@ void OverallTests::checkOggTestfile2()
         checkOggTestMetaData();
         break;
     case TagStatus::Removed:
-        CPPUNIT_ASSERT_EQUAL(0_st, tracks.size());
+        CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
     }
 }
 
diff --git a/tests/tagvalue.cpp b/tests/tagvalue.cpp
index cdaed77..85a9ac1 100644
--- a/tests/tagvalue.cpp
+++ b/tests/tagvalue.cpp
@@ -62,7 +62,7 @@ void TagValueTests::testBinary()
 {
     const TagValue binary("123", 3, TagDataType::Binary);
     CPPUNIT_ASSERT_EQUAL(TagDataType::Binary, binary.type());
-    CPPUNIT_ASSERT_EQUAL("123"s, string(binary.dataPointer()));
+    CPPUNIT_ASSERT_EQUAL("123"s, string(binary.dataPointer(), binary.dataSize()));
     CPPUNIT_ASSERT_THROW(binary.toString(), ConversionException);
     CPPUNIT_ASSERT_THROW(binary.toInteger(), ConversionException);
     CPPUNIT_ASSERT_THROW(binary.toPositionInSet(), ConversionException);