WIP correct tests
WIP -- correct tests, spans