More refactoring
Cleaning on tests executor