-fixed sonar issues
-added assertion tests