* Fix Sonar issue, formatting * Remove dev dependencies from requirements.tzt * Fix unit test failure