Added factory_girl and rspec, written some tests