Update Test and code for changes coming in SimPEG

There will be some issues when SimPEG mapping updates merge to master.

I have fixed most of these in this fork. You can probably wait to pull these changes until SimPEG has been updated.