Fix regex test
refactor some tests