adjusting sub folder targeting for deletion
updated tests to work with changes to how we're using trees