refactoring and fixing unit test issues

Vuillaumerequested to merge
hotfix into master

Should fix current failing tests

Edited by Vuillaume

Merge request reports