Messed up ios merge - added some stuff back in and cleaned the ios tests up a bit
fixed up some more ios tests