Merge pull request #78 from tkrille/cleanup_tests

Cleanup tests
[fix] fix of SONAR Problems
formatted code