Updated Merchant controller and added new test page.