Add test for child removal
Add more test converage