LPS-32370
LPS-32370 Move tests