Merge pull request #23 from alberts-tid/task/add_unit_tests

Task/add unit tests
Merge remote-tracking branch 'upstream/develop' into bug/CLAUDIA-4366