Refactoring, add dependencies and unit tests using Common_Test