LPS-45197 fixed one and added new testcase