=fixed regex and improved tests