diff --git a/tests/MathDatabaseTest.php b/tests/MathDatabaseTest.php
index 7e55f7c..2319cf6 100644
--- a/tests/MathDatabaseTest.php
+++ b/tests/MathDatabaseTest.php
@@ -61,8 +61,8 @@ class MathDatabaseTest extends MediaWikiTestCase {
 
 	/**
 	 * Checks database access. Writes an entry and reads it back.
-	 * @covers MathRenderer::writeDatabaseEntry()
-	 * @covers MathRenderer::readDatabaseEntry()
+	 * @covers MathRenderer::writeToDatabase
+	 * @covers MathRenderer::readFromDatabase
 	 */
 	public function testDBBasics() {
 		$this->setValues();
diff --git a/tests/MathInputCheckTexvcTest.php b/tests/MathInputCheckTexvcTest.php
index 8c80586..e71e44e 100644
--- a/tests/MathInputCheckTexvcTest.php
+++ b/tests/MathInputCheckTexvcTest.php
@@ -87,7 +87,7 @@ class MathInputCheckTexvcTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * @covers MathInputCheckTexvc::testGetError
+	 * @covers MathInputCheckTexvc::getError
 	 */
 	public function testGetError() {
 		$this->assertNull( $this->GoodObject->getError() );
diff --git a/tests/MathLaTeXMLDatabaseTest.php b/tests/MathLaTeXMLDatabaseTest.php
index 399966d..7c179f5 100644
--- a/tests/MathLaTeXMLDatabaseTest.php
+++ b/tests/MathLaTeXMLDatabaseTest.php
@@ -95,8 +95,8 @@ class MathLaTeXMLDatabaseTest extends MediaWikiTestCase {
 	/**
 	 * Checks database access. Writes an entry and reads it back.
 	 * @depends testCreateTable
-	 * @covers MathRenderer::writeDatabaseEntry()
-	 * @covers MathRenderer::readDatabaseEntry()
+	 * @covers MathRenderer::writeToDatabase
+	 * @covers MathRenderer::readFromDatabase
 	 */
 	public function testDBBasics() {
 		$this->setValues();
diff --git a/tests/MathMathMLTest.php b/tests/MathMathMLTest.php
index 60d2cea..470d413 100644
--- a/tests/MathMathMLTest.php
+++ b/tests/MathMathMLTest.php
@@ -33,7 +33,7 @@ class MathMathMLTest extends MediaWikiTestCase {
 	/**
 	 * Tests behavior of makeRequest() that communicates with the host.
 	 * Testcase: Invalid request.
-	 * @covers MathTexvc::makeRequest
+	 * @covers MathMathML::makeRequest
 	 */
 	public function testMakeRequestInvalid() {
 		self::setMockValues( false, false, false );
@@ -57,7 +57,7 @@ class MathMathMLTest extends MediaWikiTestCase {
 	/**
 	 * Tests behavior of makeRequest() that communicates with the host.
 	 * Testcase: Valid request.
-	 * @covers MathTexvc::makeRequest
+	 * @covers MathMathML::makeRequest
 	 */
 	public function testMakeRequestSuccess() {
 		self::setMockValues( true, true, false );
@@ -96,9 +96,9 @@ class MathMathMLTest extends MediaWikiTestCase {
 
 	/**
 	 * Checks if a String is a valid MathML element
-	 * @covers MathMathML::isValidXML
+	 * @covers MathMathML::isValidMathML
 	 */
-	public function testisValidXML() {
+	public function testisValidMathML() {
 		$renderer = $this->getMockBuilder( 'MathMathML' )
 				->setMethods( null )
 				->disableOriginalConstructor()
diff --git a/tests/MathTexvcTest.php b/tests/MathTexvcTest.php
index d407a8d..64c1fe8 100644
--- a/tests/MathTexvcTest.php
+++ b/tests/MathTexvcTest.php
@@ -171,7 +171,7 @@ class MathTexvcTest extends MediaWikiTestCase {
 
 	/**
 	 * Test behavior $change when the rendered hash was changed
-	 * @covers MathRenderer::setHash()
+	 * @covers MathTexvc::setHash
 	 */
 	public function testChangeHash() {
 		$renderer = $this->getMockBuilder( 'MathTexvc' )