Formating changes and update to MockRestAdapter to support new utils