fix regex, update test