cleanup to parse-forest

extend test code to match with changes to parse-forest