Fix span tests