Once again, uncomment expect_equals in tests