Fix xcore tests to use regex.