Reactivating calabash tests
More work on calabash tests