optimized tests and added sending to single target
Merge branch 'fClusterFixing' into development