bugfixes unit tests
Merge branch 'dev' of https://github.com/dsarkozi/care4care-sdp-grp4 into dev