CDK-385: Update CLI tests to use SPI Registration.