many tests and improved regex