Adapted for tests with new cylinder-sphere algo