regex improvement, tests