Tests for classes component
Minor fixes