OGM-480 Considering escaping; Adding test
OGM-480 Incorporating review remarks