Testing Map Keywords

We add LINEUP and BOUNDARY keywords to the parser.

Now we mess with the keyword order.