Changes to fix SFC clustering tests