Refactored view spec