add unit tests
fix according to comments
fix according to comments
fix according to comments
fix according to comments
refactor
fix conflicts
Merge pull request #111 from alberts-tid/task/add_unit_tests

Task/add unit tests