start of refactoring Klass specs