Merge "Fix LSS unit tests and make behaviour consistent under synthetic password"