Added Liquid escape, improved tests