LPS-35520

Hey Brian,

as you requested we consolidated the test logic to use only one test file and also tried to simplify the test logic.

thanks,
Daniel