JPM: extracted Clusters class to be tested separately, introduced Hit.local