LPS-42422 Tests
LPS-42422 Simplify