Follow sigtools's test=>support move