Refatoring for unit test nico

Tools management.