Add better factory girl and rspec new syntax