Changed a couple of redirect_to and functional test accordingly