Added tests for additional states.
Merge branch 'master' into gh-pages