[2.1] Unit tests for install
[2.1] Refactoring