Added sub-classing tests to core tests.
Test cleanup.