LPS-38514 Add tests