Index: wp-testcase/test_user_capabilities.php
===================================================================
--- wp-testcase/test_user_capabilities.php	(revision 325)
+++ wp-testcase/test_user_capabilities.php	(working copy)
@@ -413,72 +413,77 @@
 		
 	}
 
+	// simple tests for some common meta capabilities
 	function test_post_meta_caps() {
-		// simple tests for some common meta capabilities
-		
-		// make a [pst
-		$this->_insert_quick_posts(1);
-		$post = end($this->post_ids);
+		// the author of the post
+		$post_author = new WP_User( $this->_make_user('author') );
+		// make the post
+		$post = wp_insert_post( array(
+			'post_author' => $post_author->ID,
+			'post_status' => 'publish',
+			'post_title' => 'post title',
+			'post_content' => 'post content',
+			'post_excerpt' => 'post excerpt',
+		) );
 
-		// the author of the post
-		$author = new WP_User($this->author->ID);
-		$author->set_role('author');
-		
 		// add some other users
-		$admin = new WP_User($this->_make_user('administrator'));
-		$author_2 = new WP_User($this->_make_user('author'));
-		$editor = new WP_User($this->_make_user('editor'));
-		$contributor = new WP_User($this->_make_user('contributor'));
-		
+		$admin = new WP_User( $this->_make_user('administrator') );
+		$author = new WP_User( $this->_make_user('author') );
+		$editor = new WP_User( $this->_make_user('editor') );
+		$contributor = new WP_User( $this->_make_user('contributor') );
+
 		// administrators, editors and the post owner can edit it
-		$this->assertTrue($admin->has_cap('edit_post', $post));
-		$this->assertTrue($author->has_cap('edit_post', $post));
-		$this->assertTrue($editor->has_cap('edit_post', $post));
-		// other authors and contributors can't
-		$this->assertFalse($author_2->has_cap('edit_post', $post));
-		$this->assertFalse($contributor->has_cap('edit_post', $post));
-		
+		$this->assertTrue( $admin->has_cap('edit_post', $post) );
+		$this->assertTrue( $editor->has_cap('edit_post', $post) );
+		$this->assertTrue( $post_author->has_cap('edit_post', $post) );
+		// other authors and contributors cannot
+		$this->assertFalse( $author->has_cap('edit_post', $post) );
+		$this->assertFalse( $contributor->has_cap('edit_post', $post) );
+
 		// administrators, editors and the post owner can delete it
-		$this->assertTrue($admin->has_cap('delete_post', $post));
-		$this->assertTrue($author->has_cap('delete_post', $post));
-		$this->assertTrue($editor->has_cap('delete_post', $post));
-		// other authors and contributors can't
-		$this->assertFalse($author_2->has_cap('delete_post', $post));
-		$this->assertFalse($contributor->has_cap('delete_post', $post));
+		$this->assertTrue( $admin->has_cap('delete_post', $post) );
+		$this->assertTrue( $editor->has_cap('delete_post', $post) );
+		$this->assertTrue( $post_author->has_cap('delete_post', $post) );
+		// other authors and contributors cannot
+		$this->assertFalse( $author->has_cap('delete_post', $post) );
+		$this->assertFalse( $contributor->has_cap('delete_post', $post) );
 	}
 
+	// simple tests for some common meta capabilities
 	function test_page_meta_caps() {
-		// simple tests for some common meta capabilities
-		
-		// make a page
-		$this->_insert_quick_pages(1);
-		$page = end($this->post_ids);
+		// the author of the page
+		$page_author = new WP_User( $this->_make_user('author') );
+		// make the page
+		$page = wp_insert_post( array(
+			'post_author' => $page_author->ID,
+			'post_status' => 'publish',
+			'post_title' => 'post title',
+			'post_content' => 'post content',
+			'post_excerpt' => 'post excerpt',
+			'post_type' => 'page',
+		) );
 
-		// the author of the page
-		$author = new WP_User($this->author->ID);
-		$author->set_role('author');
-		
 		// add some other users
-		$admin = new WP_User($this->_make_user('administrator'));
-		$author_2 = new WP_User($this->_make_user('author'));
-		$editor = new WP_User($this->_make_user('editor'));
-		$contributor = new WP_User($this->_make_user('contributor'));
-		
-		// administrators, editors and the post owner can edit it
-		$this->assertTrue($admin->has_cap('edit_page', $page));
-		$this->assertTrue($editor->has_cap('edit_page', $page));
-		// other authors and contributors can't
-		$this->assertFalse($author->has_cap('edit_page', $page));
-		$this->assertFalse($author_2->has_cap('edit_page', $page));
-		$this->assertFalse($contributor->has_cap('edit_page', $page));
-		
-		// administrators, editors and the post owner can delete it
-		$this->assertTrue($admin->has_cap('delete_page', $page));
-		$this->assertTrue($editor->has_cap('delete_page', $page));
-		// other authors and contributors can't
-		$this->assertFalse($author->has_cap('delete_page', $page));
-		$this->assertFalse($author_2->has_cap('delete_page', $page));
-		$this->assertFalse($contributor->has_cap('delete_page', $page));
+		$admin = new WP_User( $this->_make_user('administrator') );
+		$author = new WP_User( $this->_make_user('author') );
+		$editor = new WP_User( $this->_make_user('editor') );
+		$contributor = new WP_User( $this->_make_user('contributor') );
+
+		// administrators and editors can edit it
+		$this->assertTrue( $admin->has_cap('edit_page', $page) );
+		$this->assertTrue( $editor->has_cap('edit_page', $page) );
+		// anyone else cannot
+		$this->assertFalse( $page_author->has_cap('edit_page', $page) );
+		$this->assertFalse( $author->has_cap('edit_page', $page) );
+		$this->assertFalse( $contributor->has_cap('edit_page', $page) );
+
+		// administrators and editors can delete it
+		$this->assertTrue( $admin->has_cap('delete_page', $page) );
+		$this->assertTrue( $editor->has_cap('delete_page', $page) );
+		// anyone else cannot
+		$this->assertFalse( $page_author->has_cap('delete_page', $page) );
+		$this->assertFalse( $author->has_cap('delete_page', $page) );
+		$this->assertFalse( $contributor->has_cap('delete_page', $page) );
 	}
 	
 	function test_usermeta_caps() {