Change the style of test to permit more entries easily
We can have all sorts of things between a tag and its value
Merge pull request #16 from jml/tagged-value-fix

Tagged value fix