Test fix for underscore escaping problem