added factory girl, finished users tests using factory girl