Clean up version inheritance and add test to check all objects import it