added shoulda and factory_girl