Tests and fix for class toggling

Load the new tests in the test suite.