Fix wording in character class spec
Add Struct helper
Fix state machine spec