Fix tests
Merge pull request #4670 from sobkas/fix_tests

Fix tests