Fix a couple of quality issues found by Sonar
Remove rests of the old cohesion sensor implementation
More tests covering not yet covered code
Fix quality issues found by Sonar (member naming issues mostly)