SOC-4219: Add local variable for tilde index and update last testcase