Dependencies manager
Unit tests
Unit tests
Minor changes