LPS-40190 Simplify
LPS-40190 Tests