Nov12

Creating pull request for code review. See comments in diff.
There is no TestState 'acitivity' so to speak. You really don't need this state. Follow the CM.