Minor updates of forester component and tests