- Updated design and mockserver with 2 new API calls (merchant, myid)