WIP on tests
wip