beginning splitting of forest and marks contributions to dev
remove stub of canonicalization
fixed test
Merge branch 'forest_dev' into dev
Revert "remove stub of canonicalization"

This reverts commit 3ace647b493e251e42e60b8a90dc7ac7acf64d0c.
Revert "beginning splitting of forest and marks contributions to dev"

This reverts commit 0b108c82a67de82021e9d1fc0e07d2fee949fb12.