Span library unti tests + consistency improvements.