Added more feature specs and coverage