Test cases and changes to definition states

Begin changing out to reference a definition state. Use
Definition.'state' to reference a string to use. Should protect against
future changes to the strings.