Refactoring
Fixing tests e views