002.02 Cleanup for SPI testing