Merge "Increased code coverage and fixed sonar issue"