Fixed removing child causing errors and added test folder