Added klass test
Fixed expectations in dynamic loading