Added user model p17
Added warden p19
Spec not passing from p25
refactored, still not passing p25