GONRG-6850: fix tests
See merge request !61 (merged)
(cherry picked from commit e465cd21)
2107b0b6 GONRG-6850: fix tests 66cabfc7 GONRG-6850: fix tests 6309bc34 GONRG-6850: fix tests dbf0ff4b GONRG-6850: fix tests