Unit tests are now in SonarQube. These are fixes for Sonar issues