Made some customizations. Commented out shoulda gem to fix Mocha error