Test + Fix for issue with incorrect parents