Container SPI - All tests pass (hacky way)
Container SPI - more tests are passing (hacky way)