Sarina/enhance user factories