Almo: (Major) Refactorings en Unit tests