** working **  app and some cleanup

Change-Id: I53c793f9cb5c0dce0e4cf0c5c6c17db94befcbde
fix for iphone test

Change-Id: I5cb0309db618bdc329ec74778645a37a0ee2a7d1