Merged changes from Charles for TestCone, quadric.