Try to fix the TestPointMergeCommand unittest

This is expected to fail, but I'm not sure whether that is because
flake changed so the test numbers are just wrong, or whether there
is a real bug here...