fix all EXPECT_EQ(.address) tests