cr tests fixes
view xregexp update