[1503,1566] Fixes & tests for orphanRemoval bugs