Fixed unit tests, now with regexes.