I would prefer these tests to be updated for the new tree, not commented out.