More tests ; and rewrote parser.ml