LPS-40597 Added additional tests