Updated unittests to work with new regexes