LPS-48729 Fix regex & tests