Fix and test standard escaping