Removed SpiralP's test changes.