Manually replace all remaining assert_equal calls