Index: tests/post/objects.php
===================================================================
--- tests/post/objects.php	(revision 987)
+++ tests/post/objects.php	(working copy)
@@ -54,11 +54,16 @@
 		$this->assertInternalType( 'array', $post_std );
 		$post_std = (object) $post_std;
 		$GLOBALS['post'] = $post_std;
-		$pid = null;
-		$post = get_post( $pid );
+		$post = get_post( null );
 		$this->assertInstanceOf( 'WP_Post', $post );
 		$this->assertEquals( $id, $post->ID );
 		unset( $GLOBALS['post'] );
+
+		// If no global post and passing empty value, expect null.
+		$this->assertNull( get_post( null ) );
+		$this->assertNull( get_post( 0 ) );
+		$this->assertNull( get_post( '' ) );
+		$this->assertNull( get_post( false ) );
 	}
 
 	function test_get_post_ancestors() {
Index: tests/ms.php
===================================================================
--- tests/ms.php	(revision 987)
+++ tests/ms.php	(working copy)
@@ -351,10 +351,10 @@
 	}
 
 	function test_switch_restore_blog() {
-		global $_wp_switched, $_wp_switched_stack, $wpdb;
+		global $_wp_switched_stack, $wpdb;
 
 		$this->assertEquals( array(), $_wp_switched_stack );
-		$this->assertFalse( $_wp_switched );
+		$this->assertFalse( ms_is_switched() );
 		$current_blog_id = get_current_blog_id();
 		$this->assertInternalType( 'integer', $current_blog_id );
 
@@ -378,7 +378,7 @@
 
 		switch_to_blog( $blog_id );
 		$this->assertEquals( array( $current_blog_id ), $_wp_switched_stack );
-		$this->assertTrue( $_wp_switched );
+		$this->assertTrue( ms_is_switched() );
 		$this->assertEquals( $blog_id, $wpdb->blogid );
 		$this->assertFalse( wp_cache_get( 'switch-test', 'switch-test' ) );
 		wp_cache_set( 'switch-test', $blog_id, 'switch-test' );
@@ -386,7 +386,7 @@
 
 		switch_to_blog( $blog_id );
 		$this->assertEquals( array( $current_blog_id, $blog_id ), $_wp_switched_stack );
-		$this->assertTrue( $_wp_switched );
+		$this->assertTrue( ms_is_switched() );
 		$this->assertEquals( $blog_id, $wpdb->blogid );
 		$this->assertEquals( $blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
 
@@ -399,7 +399,7 @@
 		restore_current_blog();
 		$this->assertEquals( $current_blog_id, get_current_blog_id() );
 		$this->assertEquals( array(), $_wp_switched_stack );
-		$this->assertFalse( $_wp_switched );
+		$this->assertFalse( ms_is_switched() );
 		$this->assertEquals( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
 
 		$this->assertFalse( restore_current_blog() );