LPS-39753 Fix tests