IC-13
- added tests
- fixed sonar findings