fixed some sonar bugs
Merge branch 'shutka' of https://github.com/nromanen/Ch-025 into shutka
Merge branch 'master' of https://github.com/nromanen/Ch-025 into shutka
Merge branch 'master' of https://github.com/nromanen/Ch-025 into shutka
Merge branch 'shutka' of https://github.com/nromanen/Ch-025 into shutka
Change styles for tests, add validation
fix merge