LPS-33132 fix issues with tests