Removed the sub-classes as they are not longer needed. Refactored test
to remove multi class test as they don't make sense now.