LPS-46978 Added tests
LPS-46978 Fixes