Adding test samples + global escaping bug