Container and span tests passing