Switched syntactic classifier to use new tree

Also added tests.