Work on tests setup