Fixed broken test
Merge remote-tracking branch 'rickard/wildcardcluster' into wildcardcluster