added factory girl and some tests