Feature/wip tests