LPS-34126 improve tests