fixing tests
Merge remote-tracking branch 'origin/lergo-559' into lergo-559