added klass classes and tests