Simplified payment_controller and added missing specs