Few changes. Tests need cleaning up. Adding more before I head home for the night.

You will have to show me more about FactoryGirl. Enjoy the break man. Party hard with your girlfriend and Merry Christmas