Adding SubClass and unit tests for it