refactored user integration tests