HAL-2
- fixed sonar findings
- removed empty link option
- added tests