SVY-7293 reverted a bit of refactoring from previous commit and fixed 2
tests