Improve tokenization tests on primary_attr blocks

Increases the number and kind of tests run on tokenizing Primary Attribute
blocks.
Fixes to parsing for Primary Attribute blocks