Container SPI - test fixes