Uncomment out regex files and get tests passing again