Add factory girl gem
Rewrite some spec