Updated parser tests. Changed 'scenario' to 'constraint' to conform 
to the terminology most often used in the literature
Updated grammar to use 'constraints' instead of 'scenarios'