LPS-45008

LPS-45008 Tests fixed