Made test work
Changed test.pl to respect the simplified grammar
Cleaned test output