Fix regex again

Fixing more test cases