Unit Tests, beautification code and some changes with modules