refactored user specs some more