Remove CartridgeStream, add CartridgeType test to create