[QAUTH-15]-->[Master] Refactored user  model spec