Added some more uses of ASSERT_STREQ.