LPS-45501 - Add more test