Add more tests for nested states.
Merge branch 'master' into more-tests
Merge pull request #14 from erinspice/more-tests

More tests