Add "Klass" and test