- Storage: Some base methods decoupled from views
- Tests improvements