Add Class utility function
Add a tests for Class utility
Fix issues in Class utility while testing