In progress: trying to pass octree tests.