Search lib tests modularization
Machine tests refactoring