Add tests proving that spans are now handled correctly