Updates for portability
Calabash testing files