Fixes for iOS to buttons and cover ing testing