fixed unit tests
unmerged
Merge branch 'feature/tests' into develop