Improved SExpr parser and added some test cases