New tests update and regular expression fixed