Minor testing artifacts
More sonar fixes