FA clustering

Missing tests