Bug 1110956 follow-up: Use EXPECT macros instead of ASSERT