Moving to the new structure of the parts and thereby fixing the test.