Updated regex, removed failing tests