LPS-48357 Apply usage
LPS-48357 Fix unit tests