Make UI test work on OC6 and OC7