Refactored UserTests