Refactored spec contexts for User
Refactored Van specs