rebased develop and resolved the merge conflicts
fixed unit tests