LPS-49930 Tests
LPS-49930 Fix tests and improve performance
LPS-49930 SF