unit test updated.
some sonar issues updated.