Update specs to new requirements for Merchant
Update classes for new Merchant requirements (not passing Integration Spec)