LPS-49920 Fixing tests infrastructure.