Rebuilt MapTests, TreeTests now passes