LPS-42439 Fix tests
LPS-42439 Extract to a inner method
LPS-42439 SF