Modified comments
Improved testing. Changed to use factory_girl.