Properly escape string; Removed Literal class
Added basic tests