Merge "Removed unnecessary check. Replaced EXPECT_TRUE with EXPECT_NE."