Refactoring unittests
more refactoring
Merge branch 'feature/refactoring-unittests' into develop