Merge "Replaced CHECK with EXPECT in tests."