orphans
Prevent orphans creation #525
tests for Prevent orphans creation #525