fixed Klass is not a plain object
add class tests