Refactor regex

Regex moved to another test project!