Index: tests/phpunit/tests/admin/includesTemplate.php
===================================================================
--- tests/phpunit/tests/admin/includesTemplate.php	(revision 29803)
+++ tests/phpunit/tests/admin/includesTemplate.php	(working copy)
@@ -45,4 +45,34 @@
 		$this->assertEquals('', selected(0,false,false));
 		$this->assertEquals('', checked(0,false,false));
 	}
-}
+
+	function test_add_metabox() {
+
+		global $wp_meta_boxes;
+
+		add_meta_box( 'testbox1', 'Test Metabox', '__return_false', 'post' );
+		
+		$this->assertTrue( array_key_exists( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] ) );
+
+		add_meta_box( 'testbox2', 'Test Metabox', '__return_false', array( 'post', 'page' ) );
+
+		$this->assertTrue( array_key_exists( 'testbox2', $wp_meta_boxes['post']['advanced']['default'] ) );
+		$this->assertTrue( array_key_exists( 'testbox2', $wp_meta_boxes['page']['advanced']['default'] ) );
+	}
+
+	function test_remove_metabox() {
+
+		global $wp_meta_boxes;
+
+		// Add some meta boxes to remove
+		add_meta_box( 'testbox1', 'Test Metabox', '__return_false', 'post' );
+
+		// Remove one
+		remove_meta_box( 'testbox1', 'post', 'advanced' );
+		
+		// Check that it was removed properly
+		$this->assertFalse( array_key_exists( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] ) );
+
+	}
+
+}
\ No newline at end of file