tests refactor
{{}} regex/g fix