Fix quality flaws and improve unit test
SONAR-4378 Minor UI fixes