added factory girl factories and finished user controller tests