Add software clustering for UT

Add a clustering for the UT to avoid neighboring strips making it into independent hits, essentially leading to duplications.

@mstahl should be similar for Allen