Improved tests setup/cleanup a bit