added factory girl and started restoring unit test