Add parentcomponent to structure
Fix incomplete tests