Changes necessary to get tests passing on linux

I don't understand why I needed to reorder the regular expression. Before I
did it was not accepting "p1" as a valid parameter.
merge