Fixed broken tests after escaping change