Fix bug with unsetThemeState + more tests.
Merge pull request #2077 from mockingbird/fix-cpcheckbutton-theme-bug

Fix bug with unsetThemeState + more tests.
Fix CPViewTest
Merge pull request #2077 from mockingbird/fix-cpcheckbutton-theme-bug

Fix bug with unsetThemeState + more tests.