Test cleanup: merged finality test and unredefinable subclass test