o cleaning up tests in order to move them to the core using core components, and removing superfluous/repeated tests