I fixed the component and component_owner test but caused 3 other tests to
start failing.  Will investigate after code review.