fixing tests
refactored user tests