fix regex and add unittests