Increased test coverage based on Sonar.