LPS-30002 Fix unit tests