Changed ASSERT_EQ to EXPECT_EQ in tests