Turn off default escaping and added tests