Sonar fixes + new tests

some rebase troubles