Addressed changes from code review.
Functional change: corrected use of EXPECT_EQ macros in tests.