LPS-43587 - Adds additional test cases