fix spec broken by changing spans_into_xxx classes.

*spans* conflicts with bootstrap.
Merge branch 'upgrades-bootstrap' into upgrades