Included production & testing changes for heroku