Remove span wrapping element, fix tests

wip

fix tests