Adjusted tests to adhere to refactored ComponentType/Manager