updated foctories, added more expectations for user spec