Remove span wrapping element, fix tests

wip

fix tests
Merge pull request #11 from vasilakisfil/feat/remove_span

Remove span wrapping element, fix tests