Created Class.overrideClass
Code cleanup
Removed duplicated test
Ensure the overrideClass isn't caleld in the base class